Hello community,
here is the log from the commit of package NX
checked in at Wed Apr 9 22:03:34 CEST 2008.
--------
--- NX/NX.changes 2008-03-17 23:36:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/NX/NX.changes 2008-04-08 23:58:02.687554000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 9 00:17:06 CEST 2008 - sndirsch@suse.de
+
+- nxproxy.diff
+ * obsoletes nxssh (bnc #375246)
+
+-------------------------------------------------------------------
Old:
----
nxssh-2.1.0-2.tar.gz
New:
----
nxproxy.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NX.spec ++++++
--- /var/tmp/diff_new_pack.U14411/_old 2008-04-09 21:59:22.000000000 +0200
+++ /var/tmp/diff_new_pack.U14411/_new 2008-04-09 21:59:22.000000000 +0200
@@ -26,7 +26,7 @@
Url: http://www.nomachine.com/sources.php
Group: System/X11/Servers/XF86_4
Version: 2.1.0
-Release: 67
+Release: 74
Summary: Proxy System for X11
#Compression Libraries and Proxy Sources
Source: nxproxy-%{version}-3.tar.gz
@@ -39,8 +39,6 @@
Source10: nxviewer-%{version}-12.tar.gz
#RDP Agent Sources
Source11: nxdesktop-%{version}-10.tar.gz
-#SSH Sources
-Source13: nxssh-%{version}-2.tar.gz
#NX Example Scripts
Source14: nxscripts-%{version}-5.tar.gz
Source15: nxagent
@@ -63,6 +61,7 @@
Patch16: CVE-2007-6428-TOG-cup.diff
Patch17: CVE-2007-6429-shm_evi.diff
Patch18: CVE-2008-0006-pcf_font.diff
+Patch19: nxproxy.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define my_provides /tmp/my-provides
%define my_requires /tmp/my-requires
@@ -77,7 +76,7 @@
Nomachine
%prep
-%setup -n nxproxy -b1 -b2 -b5 -b6 -b10 -b11 -b13 -b14
+%setup -n nxproxy -b1 -b2 -b5 -b6 -b10 -b11 -b14
cd $RPM_BUILD_DIR
%patch
%ifarch ia64
@@ -115,6 +114,9 @@
%patch17 -p1
%patch18 -p1
popd
+pushd nxproxy
+%patch19
+popd
ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1
cat >> nx-X11/config/cf/host.def << EOF
#ifdef i386Architecture
@@ -172,12 +174,6 @@
./configure --prefix=/usr --sharedir=/usr/share/NX
make
popd
-# build SSH
-pushd nxssh
- autoreconf -fi
- ./configure
- make
-popd
%install
cd $RPM_BUILD_DIR
@@ -218,9 +214,6 @@
$RPM_BUILD_ROOT/usr/share/man/man1/nxdesktop.1
rm -rf $RPM_BUILD_ROOT/usr/man
popd
-# install SSH
-install -m 755 nxssh/nxssh $RPM_BUILD_ROOT/usr/lib/NX
-ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxssh
# install scripts
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/NX/examples
# Bug #156308
@@ -229,7 +222,7 @@
# documentation and license
tar xjf $RPM_SOURCE_DIR/docs.tar.bz2 -C $RPM_BUILD_ROOT/usr/share/doc/packages/NX
install -m 644 nxcomp/LICENSE $RPM_BUILD_ROOT/usr/share/doc/packages/NX
-for i in nxcomp nxdesktop nxssh; do
+for i in nxcomp nxdesktop; do
mkdir $RPM_BUILD_ROOT/usr/share/doc/packages/NX/$i
done
install -m 644 nxcomp/README $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxcomp
@@ -237,8 +230,6 @@
rm -rf nxdesktop/doc/CVS
chmod 644 nxdesktop/doc/keymap-names.txt
cp -r nxdesktop/doc $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxdesktop
-install -m 644 nxssh/{CREDITS,LICENSE,README} \
- $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxssh
# avoid bogus dependencies - Bug #212276
cat << EOF > %{my_provides}
#!/bin/sh
@@ -268,13 +259,11 @@
/usr/bin/nxagent
/usr/bin/nxdesktop
/usr/bin/nxproxy
-/usr/bin/nxssh
/usr/bin/nxviewer
%dir /usr/lib/NX
/usr/lib/NX/nxagent
/usr/lib/NX/nxdesktop
/usr/lib/NX/nxproxy
-/usr/lib/NX/nxssh
/usr/lib/NX/nxviewer
%dir /usr/lib/NX/lib
/usr/lib/NX/lib/libX11.so.*
@@ -287,6 +276,9 @@
/usr/share/NX/keymaps-windows/
%changelog
+* Wed Apr 09 2008 sndirsch@suse.de
+- nxproxy.diff
+ * obsoletes nxssh (bnc #375246)
* Tue Mar 18 2008 sndirsch@suse.de
- no longer build nxpasswd; obsoleted by a fork in FreeNX
* Fri Feb 29 2008 dmueller@suse.de
@@ -305,7 +297,7 @@
* fix several integer overflows. (Bug #154928)
* Thu Jul 05 2007 sndirsch@suse.de
- added build of nxssh (again); required by qtnx
-* Mon Jun 18 2007 sndirsch@suse.de
+* Tue Jun 19 2007 sndirsch@suse.de
- avoid string compare with char literal
* Thu May 31 2007 sndirsch@suse.de
- make rpmlint happy (spurious-executable-perm)
@@ -323,7 +315,7 @@
* Mon Dec 18 2006 sndirsch@suse.de
- xorg7.diff:
* finally fixed xkb path (Bug #228516)
-* Wed Dec 13 2006 sndirsch@suse.de
+* Thu Dec 14 2006 sndirsch@suse.de
- finally added ExcludeArch for ia64, ppc64, s390x and x86_64
* Tue Nov 07 2006 ro@suse.de
- fix perms in docfile keymap-names.txt
@@ -399,7 +391,7 @@
* Mon Aug 15 2005 sndirsch@suse.de
- NX-data-range.patch:
* fixes serious compiler warnings (Bug #104610)
-* Fri Aug 12 2005 sndirsch@suse.de
+* Sat Aug 13 2005 sndirsch@suse.de
- updated to first maintenance release of NX 1.5.0
(nxcomp 1.5.0-63 --> nxcomp 1.5.0-65)
* nxcomp-1.5.0-65
@@ -458,13 +450,13 @@
- gcc4-friends.patch
* fixes new gcc build error:
"ISO C++ forbids declaration of 'xxx' with no type"
-* Sat May 14 2005 sndirsch@suse.de
+* Sun May 15 2005 sndirsch@suse.de
- fixed fatal "uninitialized" warnings
* Fri May 13 2005 sndirsch@suse.de
- use norootforbuild
* Thu May 05 2005 sndirsch@suse.de
- #neededforbuild: audiofile, audiofile-devel not required
-* Thu Apr 28 2005 sndirsch@suse.de
+* Fri Apr 29 2005 sndirsch@suse.de
- update to snapshot 1.5.0 release
nx-X11-1.4.0-10.tar.gz --> nx-X11-1.5.0-4.tar.gz
nxagent-1.4.0-65.tar.gz --> nxagent-1.5.0-23.tar.gz
++++++ nxproxy.diff ++++++
--- Main.c.old 2007-07-18 17:39:13.000000000 +0200
+++ Main.c 2008-03-12 04:40:30.000000000 +0100
@@ -36,28 +36,48 @@
int result = -1;
char *options = NULL;
-
+
+ char *nx_commfd_str = NULL;
+
options = getenv("NX_DISPLAY");
-
- if (NXTransParseCommandLine(argc, argv) < 0)
+
+ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
{
- NXTransCleanup();
- }
+ int nx_commfd = atoi(nx_commfd_str);
- if (NXTransParseEnvironment(options, 0) < 0)
- {
- NXTransCleanup();
+ if (result)
+ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
+
+ // go into endless loop
+
+ if (result)
+ {
+ while (NXTransRunning(NX_FD_ANY))
+ result = NXTransContinue(NULL);
+ }
}
+ else
+ {
+ if (NXTransParseCommandLine(argc, argv) < 0)
+ {
+ NXTransCleanup();
+ }
+
+ if (NXTransParseEnvironment(options, 0) < 0)
+ {
+ NXTransCleanup();
+ }
+
+ /*
+ * This should not return...
+ */
+
+ #ifdef TEST
+ fprintf(stderr, "Main: Yielding control to NX entry point.\n");
+ #endif
- /*
- * This should not return...
- */
-
- #ifdef TEST
- fprintf(stderr, "Main: Yielding control to NX entry point.\n");
- #endif
-
- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
+ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
+ }
/*
* ...So these should not be called.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org