rpms/freenx/FC-4 fc5-050nxloadconfig.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 freenx.spec, 1.1, 1.2 sources, 1.2, 1.3 netcat.diff, 1.1, NONE
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Thu Jun 8 23:50:43 UTC 2006
Author: zipsonic
Update of /cvs/extras/rpms/freenx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9142/FC-4
Modified Files:
.cvsignore freenx.spec sources
Added Files:
fc5-050nxloadconfig.diff
Removed Files:
netcat.diff
Log Message:
auto-import freenx-0.5.0-0.3.test7 on branch FC-4 from freenx-0.5.0-0.3.test7.src.rpm
fc5-050nxloadconfig.diff:
--- NEW FILE fc5-050nxloadconfig.diff ---
diff -Naur nxloadconfig.orig nxloadconfig
--- nxloadconfig.orig 2006-04-13 09:20:46.000000000 -0700
+++ nxloadconfig 2006-04-13 09:32:07.000000000 -0700
@@ -153,14 +153,15 @@
USER_X_STARTUP_SCRIPT=.Xclients
DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
COMMAND_START_KDE=startkde
-COMMAND_START_GNOME=gnome-session
+#COMMAND_START_GNOME=gnome-session
+COMMAND_START_GNOME="/usr/bin/dbus-launch /usr/bin/gnome-session"
COMMAND_START_CDE=cdwm
COMMAND_XTERM=xterm
COMMAND_XAUTH=$(which xauth)
[ -z "$COMMAND_XAUTH" ] && COMMAND_XAUTH=/usr/X11R6/bin/xauth
COMMAND_SMBMOUNT=smbmount
COMMAND_SMBUMOUNT=smbumount
-COMMAND_NETCAT=netcat
+COMMAND_NETCAT=nc
COMMAND_SSH=ssh
COMMAND_SSH_KEYGEN=ssh-keygen
COMMAND_CUPSD=/usr/sbin/cupsd
@@ -496,7 +497,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 | grep 'NXAGENT - Version 1.5.0')"] && \
+ [ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.0 backend is needed for this version of FreeNX."
[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 May 2005 22:01:58 -0000 1.2
+++ .cvsignore 8 Jun 2006 23:50:43 -0000 1.3
@@ -1 +1 @@
-freenx-0.4.0.tar.gz
+freenx-0.5.0-test-2006-03-11-7.tar.gz
Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-4/freenx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freenx.spec 11 May 2005 22:01:58 -0000 1.1
+++ freenx.spec 8 Jun 2006 23:50:43 -0000 1.2
@@ -1,16 +1,16 @@
Name: freenx
-Version: 0.4.0
-Release: 1
-Summary: freenx application/thin-client server
-
+Version: 0.5.0
+Release: 0.3.test7%{?dist}
+Summary: Freenx application/thin-client server
Group: Applications/Internet
License: GPL
-URL: http://debian.tu-bs.de/knoppix/nx/
-Source0: freenx-0.4.0.tar.gz
-Patch0: netcat.diff
+URL: http://freenx.berlios.de
+Source0: %{name}-%{version}-test-2006-03-11-7.tar.gz
+Patch0: fc5-050nxloadconfig.diff
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssh-server nc expect nx xorg-x11 xorg-x11-tools perl
+Requires: openssh-server nc expect xorg-x11-server-Xorg xorg-x11-apps perl
+Requires: nx >= 1.5.0
%description
Freenx is an application/thin-client server based on nx technology.
@@ -20,28 +20,28 @@
of the nxserver component.
%prep
-%setup -q -n freenx-%{version}
+%setup -q -n %{name}-%{version}-test-2006-03-11-7
%patch0 -p0
%build
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/etc/nxserver
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/closed
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/running
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/failed
-chmod 700 $RPM_BUILD_ROOT/%{_var}/lib/nxserver
-chmod 700 $RPM_BUILD_ROOT/%{_var}/lib/nxserver/*
-chmod 700 $RPM_BUILD_ROOT/%{_var}/lib/nxserver/db/*
+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 $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 node.conf.sample $RPM_BUILD_ROOT/etc/nxserver
+ nxloadconfig %{buildroot}/%{_bindir}
+install -m 755 node.conf.sample %{buildroot}/%{_sysconfdir}/nxserver
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
export $(grep ^NX_DIR %{_bindir}/nxloadconfig)
@@ -51,54 +51,56 @@
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 ]
+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
+ %{_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 ]
+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
+ 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 -m -d ${NX_HOME_DIR} -s %{_bindir}/nxserver nx
- mkdir -p ${NX_HOME_DIR}/.ssh
- chmod 700 ${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
-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
-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 /etc/ssh/ssh_host_rsa_key.pub >> ${NX_HOME_DIR}/.ssh/known_hosts
-chown -R nx:root /var/lib/nxserver
+ %{_sbindir}/useradd -r -d $NX_HOME_DIR -s %{_bindir}/nxserver nx
+ mkdir -p $NX_HOME_DIR/.ssh
+ chmod 700 $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
+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 ]
+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
+ 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
-chown nx:root ${NX_LOGFILE}
+chown nx:root $NX_LOGFILE
%preun
if [ $1 = 0 ]
@@ -108,16 +110,16 @@
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
+ 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
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog CONTRIB
%{_bindir}/*
-%dir /etc/nxserver
-/etc/nxserver/node.conf.sample
+%dir %{_sysconfdir}/nxserver
+%{_sysconfdir}/nxserver/node.conf.sample
%dir %{_var}/lib/nxserver
%dir %{_var}/lib/nxserver/db
%dir %{_var}/lib/nxserver/db/closed
@@ -125,13 +127,42 @@
%dir %{_var}/lib/nxserver/db/failed
%changelog
+* 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 at redhat.com> 0.3.1-4
- spec cleanup
-
* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freenx/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 May 2005 22:01:58 -0000 1.2
+++ sources 8 Jun 2006 23:50:43 -0000 1.3
@@ -1 +1 @@
-a57046e79fb980b4720ec6ae67ed1f19 freenx-0.4.0.tar.gz
+b627433904cd6eed38b14524d3b45cbd freenx-0.5.0-test-2006-03-11-7.tar.gz
--- netcat.diff DELETED ---
More information about the fedora-extras-commits
mailing list