[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/freenx/FC-6 freenx-0.6.0-libs.patch, NONE, 1.1 freenx.spec, 1.5, 1.6 sources, 1.4, 1.5



Author: athimm

Update of /cvs/extras/rpms/freenx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv574/freenx/FC-6

Modified Files:
	freenx.spec sources 
Added Files:
	freenx-0.6.0-libs.patch 
Log Message:
Backport 0.6.0

freenx-0.6.0-libs.patch:

--- NEW FILE freenx-0.6.0-libs.patch ---
--- /usr/libexec/nx/nxloadconfig~	2007-03-04 23:55:42.000000000 +0100
+++ /usr/libexec/nx/nxloadconfig	2007-03-05 00:02:19.000000000 +0100
@@ -263,7 +263,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.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
+[ -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.2:$APPLICATION_LIBRARY_PATH/libXcompext.so.2:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
 if [ -z "$ENABLE_2_0_0_BACKEND" ]
 then
 	ENABLE_2_0_0_BACKEND="1"


Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-6/freenx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freenx.spec	29 Sep 2006 05:31:28 -0000	1.5
+++ freenx.spec	19 May 2007 17:19:49 -0000	1.6
@@ -1,220 +1,149 @@
-Name:           freenx
-Version:        0.5.0
-Release:        5%{?dist}
-Summary:        Freenx application/thin-client server
-Group:          Applications/Internet 
-License:        GPL
-URL:            http://freenx.berlios.de
-Source0:        %{name}-%{version}.tar.gz
-Patch0:		fc5patch.diff
-Patch1:		nxclient.diff
-ExcludeArch: 	x86_64
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	openssh-server nc expect xorg-x11-server-Xorg xorg-x11-apps perl dbus-x11
-Requires:	nx >= 2.0.0
+%define _pkglibdir %{_libdir}/nx
+%define _pkgdatadir %{_datadir}/nx
+%define _pkglibexecdir %{_libexecdir}/nx
+
+Summary: Free Software (GPL) Implementation of the NX Server
+Name: freenx
+Version: 0.6.0
+Release: 12%{?dist}
+License: GPL
+Group: Applications/Internet
+URL: http://freenx.berlios.de/
+Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Patch0: freenx-0.6.0-libs.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
 
 %description
-Freenx is an application/thin-client server based on nx technology. 
-NoMachine nx is the next-generation X compression and roundtrip suppression
-scheme. It can operate remote X11 sessions over 56k modem dialup links
-or anything better. This package contains a free (GPL) implementation
-of the nxserver component.
+NX is an exciting new technology for remote display. It provides near
+local speed application responsiveness over high latency, low
+bandwidth links. The core libraries for NX are provided by NoMachine
+under the GPL. FreeNX is a GPL implementation of the NX Server.
 
 %prep
-%setup -q -n %{name}-%{version}
-
-%patch0 -p1
-%patch1 -p0
+%setup -q
+%patch0 -p4 -b .libs
+sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
+  -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
+  nxloadconfig nxserver
+sed -i -e's,^NX_LOGFILE=.*,NX_LOGFILE=/var/log/nx/nxserver.log,' \
+  nxloadconfig
 
 %build
+make -C nxserver-helper CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_sysconfdir}/nxserver
-mkdir -p %{buildroot}/%{_var}/lib/nxserver/db/closed
-mkdir -p %{buildroot}/%{_var}/lib/nxserver/db/running
-mkdir -p %{buildroot}/%{_var}/lib/nxserver/db/failed
-chmod 700 %{buildroot}/%{_var}/lib/nxserver
-chmod 700 %{buildroot}/%{_var}/lib/nxserver/*
-chmod 700 %{buildroot}/%{_var}/lib/nxserver/db/*
-install -m 755 nxclient nxnode nxkeygen nxnode-login nxserver nxprint nxsetup\
- nxloadconfig %{buildroot}/%{_bindir}
-install -m 755 node.conf.sample %{buildroot}/%{_sysconfdir}/nxserver
+mkdir -p %{buildroot}%{_pkglibexecdir}
+mkdir -p %{buildroot}/etc/nxserver
+mkdir -p %{buildroot}%{_pkglibexecdir}
+
+install -p -m 0755 nxclient nxnode nxkeygen nxnode-login nxserver \
+  nxprint nxloadconfig \
+  %{buildroot}/%{_pkglibexecdir}
+install -p -m 0755 nxserver-helper/nxserver-helper \
+  %{buildroot}%{_pkglibexecdir}
+install -p -m 0755 node.conf.sample %{buildroot}/etc/nxserver/
+
+mkdir -p %{buildroot}/var/lib/nxserver/home/.ssh
+ln -s /etc/nxserver/server.id_dsa.pub.key \
+  %{buildroot}/var/lib/nxserver/home/.ssh/authorized_keys
+chmod 0700 %{buildroot}/var/lib/nxserver/home{,/.ssh}
+
+mkdir -p %{buildroot}/var/lib/nxserver/db/closed
+mkdir -p %{buildroot}/var/lib/nxserver/db/running
+mkdir -p %{buildroot}/var/lib/nxserver/db/failed
+chmod -R 0700 %{buildroot}/var/lib/nxserver
+
+mkdir -p %{buildroot}/var/log/nx
+chmod 0700 %{buildroot}/var/log/nx
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+%{_sbindir}/useradd -r -d /var/lib/nxserver/home -s %{_pkglibexecdir}/nxserver nx 2>/dev/null \
+  || %{_sbindir}/usermod -d /var/lib/nxserver/home -s %{_pkglibexecdir}/nxserver nx 2>/dev/null || :
+
 %post
-export $(grep ^NX_DIR %{_bindir}/nxloadconfig)
-export $(grep ^NX_HOME_DIR %{_bindir}/nxloadconfig)
-export $(grep ^NX_SESS_DIR %{_bindir}/nxloadconfig)
-export $(grep ^NX_ETC_DIR %{_bindir}/nxloadconfig)
-export $(grep ^NX_LOGFILE %{_bindir}/nxloadconfig)
-export $(grep ^SSH_AUTHORIZED_KEYS %{_bindir}/nxloadconfig)
-/sbin/service sshd condrestart
-touch $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig $NX_LOGFILE
-chmod 600 $NX_ETC_DIR/pass* $NX_LOGFILE
-if [ ! -e $NX_ETC_DIR/users.id_dsa ]
-then
-	%{_bindir}/ssh-keygen -f $NX_ETC_DIR/users.id_dsa -t dsa -N "" > /dev/null 2>&1
-fi
-if [ -e $NX_HOME_DIR/.ssh/client.id_dsa.key ] && [ -e $NX_HOME_DIR/.ssh/server.id_dsa.pub.key ]
-then
-        mv -f $NX_HOME_DIR/.ssh/client.id_dsa.key $NX_ETC_DIR/client.id_dsa.key
-        mv -f $NX_HOME_DIR/.ssh/server.id_dsa.pub.key $NX_ETC_DIR/server.id_dsa.pub.key
-fi
-if ! { getent passwd | egrep -q "^nx:"; }
-then
-        %{_sbindir}/useradd -r -d $NX_HOME_DIR -s %{_bindir}/nxserver nx
-        mkdir -p $NX_HOME_DIR/.ssh
-fi
-if [ ! -e $NX_ETC_DIR/client.id_dsa.key ] || [ ! -e $NX_ETC_DIR/server.id_dsa.pub.key ]
-then
-	rm -f $NX_ETC_DIR/client.id_dsa.key
-	rm -f $NX_ETC_DIR/server.id_dsa.pub.key
-	%{_bindir}/ssh-keygen -q -t dsa -N '' -f $NX_ETC_DIR/local.id_dsa
-	mv $NX_ETC_DIR/local.id_dsa $NX_ETC_DIR/client.id_dsa.key
-	mv $NX_ETC_DIR/local.id_dsa.pub $NX_ETC_DIR/server.id_dsa.pub.key
+if test ! -e /etc/nxserver/users.id_dsa; then
+  %{_bindir}/ssh-keygen -q -t dsa -N "" -f /etc/nxserver/users.id_dsa
 fi
-cp -f $NX_ETC_DIR/client.id_dsa.key $NX_HOME_DIR/.ssh/client.id_dsa.key
-cp -f $NX_ETC_DIR/server.id_dsa.pub.key $NX_HOME_DIR/.ssh/server.id_dsa.pub.key
-chmod 600 $NX_ETC_DIR/client.id_dsa.key $NX_ETC_DIR/server.id_dsa.pub.key\
- $NX_HOME_DIR/.ssh/client.id_dsa.key $NX_HOME_DIR/.ssh/server.id_dsa.pub.key
-echo -n "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command=\"%{_bindir}/nxserver\" "\
- > $NX_HOME_DIR/.ssh/authorized_keys2
-cat $NX_HOME_DIR/.ssh/server.id_dsa.pub.key >> $NX_HOME_DIR/.ssh/authorized_keys2
-chmod 640 $NX_HOME_DIR/.ssh/authorized_keys2
-echo -n "127.0.0.1 " > $NX_HOME_DIR/.ssh/known_hosts
-cat %{_sysconfdir}/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts
-chown -R nx:root %{_var}/lib/nxserver
-chown -R nx:root $NX_SESS_DIR
-if [ -e %{_var}/lib/nxserver/running ]
-then
-	mv %{_var}/lib/nxserver/running/* $NX_SESS_DIR/running
-	mv %{_var}/lib/nxserver/closed/* $NX_SESS_DIR/closed
-	mv %{_var}/lib/nxserver/failed/* $NX_SESS_DIR/failed
-	rm -rf %{_var}/lib/nxserver/running
-	rm -rf %{_var}/lib/nxserver/closed
-	rm -rf %{_var}/lib/nxserver/failed
-	chown -R nx:root $NX_SESS_DIR
-fi
-chown -R nx:root $NX_ETC_DIR
-chown -R nx:root $NX_HOME_DIR
-chmod -R 700 $NX_HOME_DIR
-chown nx:root $NX_LOGFILE
-
-%preun
-if [ $1 = 0 ]
-then
-	export $(grep ^NX_DIR %{_bindir}/nxloadconfig)
-	export $(grep ^NX_HOME_DIR %{_bindir}/nxloadconfig)
-	rm %{_var}/lib/nxserver/db/closed/* > /dev/null 2>&1
-	rm %{_var}/lib/nxserver/db/running/* > /dev/null 2>&1
-	rm %{_var}/lib/nxserver/db/failed/* > /dev/null 2>&1
-	mv -f $NX_HOME_DIR/.ssh/client.id_dsa.key /etc/nxserver/  > /dev/null 2>&1
-	mv -f $NX_HOME_DIR/.ssh/server.id_dsa.pub.key /etc/nxserver/  > /dev/null 2>&1
+
+if ! test -e /etc/nxserver/client.id_dsa.key -a -e /etc/nxserver/server.id_dsa.pub.key; then
+  %{_bindir}/ssh-keygen -q -t dsa -N "" -f /etc/nxserver/local.id_dsa
+  mv -f /etc/nxserver/local.id_dsa /etc/nxserver/client.id_dsa.key
+  mv -f /etc/nxserver/local.id_dsa.pub /etc/nxserver/server.id_dsa.pub.key
 fi
 
+echo -n "127.0.0.1 " > /var/lib/nxserver/home/.ssh/known_hosts
+cat /etc/ssh/ssh_host_rsa_key.pub >> /var/lib/nxserver/home/.ssh/known_hosts
+chown nx:root /var/lib/nxserver/home/.ssh/known_hosts
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog CONTRIB
-%{_bindir}/*
-%dir %{_sysconfdir}/nxserver
-%{_sysconfdir}/nxserver/node.conf.sample
-%dir %{_var}/lib/nxserver
-%dir %{_var}/lib/nxserver/db
-%dir %{_var}/lib/nxserver/db/closed
-%dir %{_var}/lib/nxserver/db/running
-%dir %{_var}/lib/nxserver/db/failed
+%doc nxsetup
+%{_pkglibexecdir}/*
+%defattr(-,nx,root,-)
+/etc/nxserver
+/var/lib/nxserver
+/var/log/nx
 
 %changelog
-* Thu Sep 28 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-5
-- updated nxclient script to svn which fixes problems with suspend when
-  !M client is not installed on the server.
-* Mon Aug 28 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-4
-- upping version for rebuild
-- added fix for nxsetup not displaying the proper message
-- updated the node.conf.sample to show the fedora defaults
-- added dbus-x11 to dependencies to fix BZ# 200756
-- added AGENXT_EXTRA_OPTIONS_X to nxloadconfig for modular x.org compat
-* Sun Jul 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-2
-- updating dependencies to have the nx 2.0.0 backend
-- tweaked nxloadconfig for gnome and kde startup and nx 2.0.0 backend
-- added --override switch to nxsetup to warn users that the setup was already completed
-- retweaked BZ# 197812 fix
-* Sun Jul 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-1
-- updated to 0.5.0 final
-- fixed bug with nx user home directory permissions. BZ# 197812
-* Sun Jun 11 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.5.test7
-- Removed buildarch: noarch, and added excludearch: x86_64 to fix broken dependencies in x86_64
-* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.3.test7
-- added dist tag
-* Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.2.test7
-- fixed variable/macro inconsistencies
-* Tue Jun 06 2006 Rick Stout <zipsonic[AT]gmail.com> 0.5.0-0.1.test7
-- reworked spec for fedora-extras
-* Wed May 05 2006 Rick Stout <zipsonic[AT]gmail.com> 0.4.9-0.5.0-test7.0.FC5.1
-- fixed an error that would not allow useradd to create a home directory in
-  /var/lib if selinux was set to enforcing
-* Wed Apr 13 2006 Rick Stout <zipsonic[AT]gmail.com> 0.4.9-0.5.0-test7.0.FC5.0
-- updated to freenx 0.5.0 test7
-- updated nxloadconfig for fc5 specfic items
-- applied fix to error in nxloadconfig on test7
-* Wed Feb 02 2006 Rick Stout <zipsonic[AT]gmail.com> 0.4.4-2.FC5
-- updated nxloadconfig for fc5
-- updated dependencies for fc5
-* Thu Jan 26 2006 Rick Stout <zipsonic[AT]gmail.com> 0.4.4-2
-- updated authorized keys file code to disable port, X11 and agent forwarding for for the nx account
-- miscellaneous macro housekeeping 
-* Sat Aug 06 2005 Rick Stout <zipsonic[AT]gmail.com> 0.4.4-1
-- updated to 0.4.4
-* Wed Aug 03 2005 Rick Stout <zipsonic[AT]gmail.com> 0.4.3.9-2
-- updated to 0.4.4-rc1
-- added patch to nxloadconfig to require 1.5.0 nx backend
-* Mon Aug 01 2005 Rick Stout <zipsonic[AT]gmail.com> 0.4.3-1
-- updated to 0.4.3
-* Tue Jul 26 2005 Rick Stout <zipsonic[AT]gmail.com> 0.4.2-1
-- updated to 0.4.2
-* Tue Jun 28 2005 Rick Stout <zipsonic[AT]gmail.com> 0.4.1-1
-- updated to 0.4.1
-- updated freenx url
-* Fri May 06 2005 Rick Stout <zipsonic[AT]gmail.com> 0.4.0-1
-- Updated to 0.4.0
-- updated netcat.diff for obvious reasons
-* Mon Apr 11 2005 Tom "spot" Callaway <tcallawa redhat com> 0.3.1-4
-- spec cleanup
+* Mon Feb 19 2007 Axel Thimm <Axel Thimm ATrpms net> - 0.6.0-9
+- Update to 0.6.0.
+
+* Sat Sep 17 2005 Axel Thimm <Axel Thimm ATrpms net>
+- Update to 0.4.4.
+
+* Sat Jul 30 2005 Axel Thimm <Axel Thimm ATrpms net>
+- Update to 0.4.2.
+
+* Sat Jul  9 2005 Axel Thimm <Axel Thimm ATrpms net>
+- Update to 0.4.1.
+
 * Tue Mar 22 2005 Rick Stout <zipsonic[AT]gmail.com> - 0:0.3.1
 - Updated to 0.3.1 release
+
 * Tue Mar 08 2005 Rick Stout <zipsonic[AT]gmail.com> - 0:0.3.0
 - Updated to 0.3.0 release
 - Removed home directory patch as it is now default
+
 * Mon Feb 14 2005 Rick Stout <zipsonic[AT]gmail.com> - 0:0.2.8
 - Updated to 0.2.8 release
 - Fixes some security issues
 - Added geom-fix patch for windows client resuming issues
+
 * Thu Dec 02 2004 Rick Stout <zipsonic[AT]gmail.com> - 1:0.2.7
 - Fixed package removal not removing the var session directories
+
 * Tue Nov 23 2004 Rick Stout <zipsonic[AT]gmail.com> - 0:0.2.7
 - Updated to 0.2.7 release
 - fixes some stability issues with 0.2.6
+
 * Fri Nov 12 2004 Rick Stout <zipsonic[AT]gmail.com> - 1:0.2.6
 - Fixed a problem with key backup upon removal
+
 * Fri Nov 12 2004 Rick Stout <zipsonic[AT]gmail.com> - 0:0.2.6
 - Updated to 0.2.6 release
 - Changed setup to have nx user account added as a system account.
 - Changed nx home directory to /var/lib/nxserver/nxhome
+
 * Thu Oct 14 2004 Rick Stout <zipsonic[AT]gmail.com> - 0:0.2.5
 - updated package to 0.2.5 release
 - still applying patch for netcat and useradd
+
 * Fri Oct 08 2004 Rick Stout <zipsonic[AT]gmail.com> - 3:0.2.4
 - Added nxsetup functionality to the rpm
 - patched nxsetup (fnxncuseradd) script for occasional path error.
 - Added patch (fnxncuseradd) to resolve newer client connections (netcat -> nc)
 - Changed name to be more friendly (lowercase)
 - Added known dependencies
+
 * Thu Sep 30 2004 Rick Stout <zipsonic[AT]gmail.com> - 2:0.2.4
 - Patch (fnxpermatch) to fix permissions with key generation
+
 * Wed Sep 29 2004 Rick Stout <zipsonic[AT]gmail.com> - 1:0.2.4
 - Initial Fedora RPM release.
 - Updated SuSE package for Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Jul 2006 05:11:58 -0000	1.4
+++ sources	19 May 2007 17:19:49 -0000	1.5
@@ -1 +1 @@
-5ec7a75d9e03f3e175f5a9e855c5537a  freenx-0.5.0.tar.gz
+504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]