Hello community, here is the log from the commit of package NX checked in at Fri Jul 25 16:58:17 CEST 2008. -------- --- NX/NX.changes 2008-04-26 12:31:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/NX/NX.changes 2008-07-21 00:52:31.954434000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 00:38:03 CEST 2008 - sndirsch@suse.de + +- update NX to release 3.2.0 (bnc #61220) + +------------------------------------------------------------------- Old: ---- CVE-2007-6427-xinput.diff CVE-2007-6428-TOG-cup.diff CVE-2007-6429-shm_evi.diff CVE-2008-0006-pcf_font.diff nxagent-2.1.0-20.tar.gz nxagent-stringcompare.diff NX-bufferoverflow.diff nxcomp-2.1.0-8.tar.gz nxcompext-2.1.0-5.tar.gz nxcomp-gcc43.patch NX-data-range.patch nxdesktop-2.1.0-10.tar.gz nxproxy-2.1.0-3.tar.gz nxscripts-2.1.0-5.tar.gz nxviewer-2.1.0-12.tar.gz nx-X11-2.1.0-3.diff nx-X11-2.1.0-3.tar.gz ppc-no-signed-char.diff p_XFree86-4.3-ppc64.diff xorg-CAN-2005-2495.patch New: ---- nxagent-3.2.0-8.tar.gz nxcomp-3.2.0-7.tar.gz nxcompext-3.2.0-1.tar.gz nxcompshad-3.2.0-3.tar.gz nxproxy-3.2.0-1.tar.gz nxscripts-3.2.0-1.tar.gz nx-X11-3.2.0-2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package NX (Version 2.1.0) +# spec file for package NX (Version 3.2.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,48 +21,33 @@ BuildRequires: XFree86-devel gcc-c++ libjpeg-devel libpng-devel openssl-devel %endif %endif -ExcludeArch: ia64 ppc64 s390x x86_64 License: LGPL v2.1 or later; Other uncritical OpenSource License Url: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 -Version: 2.1.0 -Release: 77 +Version: 3.2.0 +Release: 1 Summary: Proxy System for X11 +Requires: tightvnc rdesktop #Compression Libraries and Proxy Sources -Source: nxproxy-%{version}-3.tar.gz -Source1: nxcomp-%{version}-8.tar.gz -Source2: nxcompext-%{version}-5.tar.gz +Source: nxproxy-%{version}-1.tar.gz +Source1: nxcomp-%{version}-7.tar.gz +Source2: nxcompext-%{version}-1.tar.gz +Source3: nxcompshad-%{version}-3.tar.gz #X11 Support Libraries and Agent Sources -Source5: nx-X11-%{version}-3.tar.gz -Source6: nxagent-%{version}-20.tar.gz -#RFB Agent Sources -Source10: nxviewer-%{version}-12.tar.gz -#RDP Agent Sources -Source11: nxdesktop-%{version}-10.tar.gz +Source5: nx-X11-%{version}-2.tar.gz +Source6: nxagent-%{version}-8.tar.gz #NX Example Scripts -Source14: nxscripts-%{version}-5.tar.gz +Source14: nxscripts-%{version}-1.tar.gz Source15: nxagent Source16: docs.tar.bz2 Patch: NX.diff Patch1: NX-noansi.diff -Patch2: p_XFree86-4.3-ppc64.diff Patch3: NX-1.5.diff -Patch4: NX-bufferoverflow.diff -Patch5: NX-data-range.patch Patch6: gcc4-friends.patch -Patch7: ppc-no-signed-char.diff -Patch8: xorg-CAN-2005-2495.patch Patch9: xorg7.diff -Patch10: nxagent-stringcompare.diff Patch11: bugzilla-154928-integer-overflows.patch Patch12: bugzilla-190902-handle-malformed-pcf-files.patch -Patch13: nxcomp-gcc43.patch -Patch15: CVE-2007-6427-xinput.diff -Patch16: CVE-2007-6428-TOG-cup.diff -Patch17: CVE-2007-6429-shm_evi.diff -Patch18: CVE-2008-0006-pcf_font.diff Patch19: nxproxy.diff -Patch20: nx-X11-2.1.0-3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define my_provides /tmp/my-provides %define my_requires /tmp/my-requires @@ -77,7 +62,7 @@ Nomachine <www.nomachine.com> %prep -%setup -n nxproxy -b1 -b2 -b5 -b6 -b10 -b11 -b14 +%setup -n nxproxy -b1 -b2 -b3 -b5 -b6 -b14 cd $RPM_BUILD_DIR %patch %ifarch ia64 @@ -85,21 +70,8 @@ %patch1 popd %endif -%ifarch ppc64 -pushd nx-X11 -%patch2 -p1 -popd -%endif %patch3 -%patch4 -%patch5 -p1 %patch6 -%patch7 -pushd nx-X11 -%patch8 -%patch10 -%patch20 -popd %if %{suse_version} > 1010 %patch9 %endif @@ -107,19 +79,9 @@ %patch11 -p1 %patch12 -p1 popd -pushd nxcomp -%patch13 -popd -pushd nx-X11/programs/Xserver -%patch15 -p4 -%patch16 -p1 -%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 #undef DefaultGcc2i386Opt @@ -158,24 +120,13 @@ popd # build X11 Support Libraries and Agents pushd nx-X11 - make World + ( make World ); rm ../nxcompshad/Logger.o; make -C ../nxcompshad + make popd # build Extended Compression Library pushd nxcompext ./configure; make popd -# build RFB Agent -if ls /usr/X11R6/%_lib/libXp.so*; then - cp -a /usr/X11R6/%_lib/libXp.so* nx-X11/exports/lib/ -fi -for dir in nxviewer/libvncauth nxviewer/nxviewer; do - pushd $dir; xmkmf -a; make 2> /dev/null; popd -done -# build RDP Agent -pushd nxdesktop - ./configure --prefix=/usr --sharedir=/usr/share/NX - make -popd %install cd $RPM_BUILD_DIR @@ -193,29 +144,9 @@ # install Compression Libraries and Proxy cp -a nxcomp/libXcomp.so.* $RPM_BUILD_ROOT/usr/lib/NX/lib cp -a nxcompext/libXcompext.so.* $RPM_BUILD_ROOT/usr/lib/NX/lib +cp -a nxcompshad/libXcompshad.so.* $RPM_BUILD_ROOT/usr/lib/NX/lib install -m 755 nxproxy/nxproxy $RPM_BUILD_ROOT/usr/lib/NX ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxproxy -# install RFB Agent -for dir in nxviewer/nxviewer; do - pushd $dir; make install DESTDIR=$RPM_BUILD_ROOT; popd -done -if ls $RPM_BUILD_ROOT/usr/bin/nxviewer; then - mv $RPM_BUILD_ROOT/usr/bin/nxviewer $RPM_BUILD_ROOT/usr/lib/NX -else - mv $RPM_BUILD_ROOT/usr/X11R6/bin/nxviewer $RPM_BUILD_ROOT/usr/lib/NX -fi -ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxviewer -chmod 755 $RPM_BUILD_ROOT/usr/bin/nxviewer -# install RDP Agent -pushd nxdesktop - make install DESTDIR=$RPM_BUILD_ROOT - mv $RPM_BUILD_ROOT/usr/bin/nxdesktop $RPM_BUILD_ROOT/usr/lib/NX - ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxdesktop - chmod 755 $RPM_BUILD_ROOT/usr/bin/nxdesktop - mv $RPM_BUILD_ROOT/usr/man/man1/nxdesktop.1 \ - $RPM_BUILD_ROOT/usr/share/man/man1/nxdesktop.1 - rm -rf $RPM_BUILD_ROOT/usr/man -popd # install scripts mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/NX/examples # Bug #156308 @@ -224,14 +155,10 @@ # 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; do +for i in nxcomp; 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 -install -m 644 nxdesktop/README $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxdesktop -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 # avoid bogus dependencies - Bug #212276 cat << EOF > %{my_provides} #!/bin/sh @@ -259,25 +186,21 @@ %defattr(-,root,root) %doc /usr/share/doc/packages/NX /usr/bin/nxagent -/usr/bin/nxdesktop /usr/bin/nxproxy -/usr/bin/nxviewer %dir /usr/lib/NX /usr/lib/NX/nxagent -/usr/lib/NX/nxdesktop /usr/lib/NX/nxproxy -/usr/lib/NX/nxviewer %dir /usr/lib/NX/lib /usr/lib/NX/lib/libX11.so.* /usr/lib/NX/lib/libXcomp.so.* /usr/lib/NX/lib/libXcompext.so.* +/usr/lib/NX/lib/libXcompshad.so.* /usr/lib/NX/lib/libXext.so.* /usr/lib/NX/lib/libXrender.so.* -%dir /usr/share/NX -/usr/share/man/man1/nxdesktop.1.gz -/usr/share/NX/keymaps-windows/ %changelog +* Mon Jul 21 2008 sndirsch@suse.de +- update NX to release 3.2.0 (bnc #61220) * Sat Apr 26 2008 coolo@suse.de - fix build * Wed Apr 09 2008 sndirsch@suse.de ++++++ bugzilla-190902-handle-malformed-pcf-files.patch ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:28.000000000 +0200 @@ -41,8 +41,8 @@ goto Exit; } diff -ru freetype-2.1.7.orig/src/pcf/pcfread.c freetype-2.1.7/src/pcf/pcfread.c ---- freetype-2.1.7.orig/src/pcf/pcfread.c 2003-08-28 12:57:05.000000000 +0200 -+++ freetype-2.1.7/src/pcf/pcfread.c 2006-07-25 13:24:53.000000000 +0200 +--- freetype2/src/pcf/pcfread.c.orig 2005-03-07 19:00:14.000000000 +0000 ++++ freetype2/src/pcf/pcfread.c 2007-12-17 18:07:39.000000000 +0000 @@ -101,7 +101,8 @@ FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) return PCF_Err_Cannot_Open_Resource; @@ -95,7 +95,7 @@ #if defined( FT_DEBUG_LEVEL_TRACE ) { -@@ -126,7 +162,8 @@ +@@ -129,7 +165,8 @@ tables = face->toc.tables; for ( i = 0; i < toc->count; i++ ) { @@ -105,7 +105,7 @@ if ( tables[i].type == (FT_UInt)( 1 << j ) ) name = tableNames[j]; -@@ -149,13 +186,15 @@ +@@ -152,13 +189,15 @@ } @@ -122,7 +122,7 @@ FT_FRAME_SHORT_LE( leftSideBearing ), FT_FRAME_SHORT_LE( rightSideBearing ), FT_FRAME_SHORT_LE( characterWidth ), -@@ -172,7 +211,7 @@ +@@ -175,7 +214,7 @@ #undef FT_STRUCTURE #define FT_STRUCTURE PCF_MetricRec @@ -131,7 +131,7 @@ FT_FRAME_SHORT( leftSideBearing ), FT_FRAME_SHORT( rightSideBearing ), FT_FRAME_SHORT( characterWidth ), -@@ -183,13 +222,15 @@ +@@ -186,13 +225,15 @@ }; @@ -148,7 +148,7 @@ FT_FRAME_BYTE( leftSideBearing ), FT_FRAME_BYTE( rightSideBearing ), FT_FRAME_BYTE( characterWidth ), -@@ -217,7 +258,7 @@ +@@ -220,7 +261,7 @@ ? pcf_metric_msb_header : pcf_metric_header; @@ -157,7 +157,7 @@ (void)FT_STREAM_READ_FIELDS( fields, metric ); } else -@@ -294,13 +337,15 @@ +@@ -297,13 +338,15 @@ } @@ -174,7 +174,7 @@ FT_FRAME_LONG_LE( name ), FT_FRAME_BYTE ( isString ), FT_FRAME_LONG_LE( value ), -@@ -314,7 +359,7 @@ +@@ -317,7 +360,7 @@ #undef FT_STRUCTURE #define FT_STRUCTURE PCF_ParsePropertyRec @@ -183,7 +183,7 @@ FT_FRAME_LONG( name ), FT_FRAME_BYTE( isString ), FT_FRAME_LONG( value ), -@@ -349,8 +394,8 @@ +@@ -352,8 +395,8 @@ PCF_Face face ) { PCF_ParseProperty props = 0; @@ -194,9 +194,9 @@ FT_ULong format, size; FT_Error error; FT_Memory memory = FT_FACE(face)->memory; -@@ -384,6 +429,15 @@ +@@ -389,6 +432,15 @@ - FT_TRACE4(( "get_prop: nprop = %d\n", nprops )); + FT_TRACE4(( " nprop = %d\n", nprops )); + /* rough estimate */ + if ( nprops > size / PCF_PROPERTY_SIZE ) @@ -210,9 +210,9 @@ if ( FT_NEW_ARRAY( props, nprops ) ) goto Bail; -@@ -421,6 +475,13 @@ +@@ -426,6 +478,13 @@ - FT_TRACE4(( "get_prop: string_size = %ld\n", string_size )); + FT_TRACE4(( " string_size = %ld\n", string_size )); + /* rough estimate */ + if ( string_size > size - nprops * PCF_PROPERTY_SIZE ) @@ -224,7 +224,7 @@ if ( FT_NEW_ARRAY( strings, string_size ) ) goto Bail; -@@ -431,20 +492,41 @@ +@@ -436,13 +495,23 @@ if ( FT_NEW_ARRAY( properties, nprops ) ) goto Bail; @@ -235,7 +235,6 @@ - /* XXX: make atom */ + FT_Long name_offset = props[i].name; + -+ + if ( ( name_offset < 0 ) || + ( (FT_ULong)name_offset > string_size ) ) + { @@ -247,16 +246,17 @@ - ft_strlen( strings + props[i].name ) + 1 ) ) + ft_strlen( strings + name_offset ) + 1 ) ) goto Bail; -- ft_strcpy( properties[i].name,strings + props[i].name ); -+ ft_strcpy( properties[i].name,strings + name_offset ); +- ft_strcpy( properties[i].name, strings + props[i].name ); ++ ft_strcpy( properties[i].name, strings + name_offset ); + + FT_TRACE4(( " %s:", properties[i].name )); - properties[i].isString = props[i].isString; +@@ -450,8 +519,17 @@ if ( props[i].isString ) { + FT_Long value_offset = props[i].value; + -+ + if ( ( value_offset < 0 ) || + ( (FT_ULong)value_offset > string_size ) ) + { @@ -269,9 +269,9 @@ + ft_strlen( strings + value_offset ) + 1 ) ) goto Bail; ft_strcpy( properties[i].value.atom, strings + props[i].value ); + +@@ -465,14 +543,8 @@ } -@@ -452,14 +534,8 @@ - properties[i].value.integer = props[i].value; } - face->properties = properties; @@ -287,7 +287,7 @@ Bail: FT_FREE( props ); FT_FREE( strings ); -@@ -474,11 +550,9 @@ +@@ -487,11 +559,9 @@ { FT_Error error = PCF_Err_Ok; FT_Memory memory = FT_FACE(face)->memory; @@ -301,7 +301,7 @@ error = pcf_seek_to_table_type( stream, -@@ -490,7 +564,8 @@ +@@ -503,7 +573,8 @@ if ( error ) return error; @@ -311,7 +311,7 @@ if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && !PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) ) -@@ -510,11 +585,27 @@ +@@ -523,11 +594,27 @@ else (void)FT_READ_USHORT_LE( nmetrics ); } @@ -340,7 +340,7 @@ if ( FT_NEW_ARRAY( face->metrics, nmetrics ) ) return PCF_Err_Out_Of_Memory; -@@ -541,6 +632,8 @@ +@@ -556,6 +643,8 @@ if ( error ) FT_FREE( face->metrics ); @@ -349,7 +349,7 @@ return error; } -@@ -555,8 +648,6 @@ +@@ -570,8 +659,6 @@ FT_Long bitmapSizes[GLYPHPADOPTIONS]; FT_ULong format, size; int nbitmaps, i, sizebitmaps = 0; @@ -358,7 +358,7 @@ error = pcf_seek_to_table_type( stream, face->toc.tables, -@@ -622,16 +713,22 @@ +@@ -640,16 +727,22 @@ FT_UNUSED( sizebitmaps ); /* only used for debugging */ for ( i = 0; i < nbitmaps; i++ ) @@ -386,7 +386,7 @@ return error; } -@@ -807,7 +904,8 @@ +@@ -829,7 +922,8 @@ if ( error ) goto Bail; @@ -396,7 +396,7 @@ if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && !PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) ) -@@ -855,7 +953,6 @@ +@@ -877,7 +971,6 @@ accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */ accel->ink_maxbounds = accel->maxbounds; } @@ -404,7 +404,7 @@ Bail: return error; -@@ -1055,7 +1153,7 @@ +@@ -1163,7 +1256,7 @@ Exit: if ( error ) { ++++++ NX-1.5.diff ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:28.000000000 +0200 @@ -31,14 +31,23 @@ action.sa_restorer = NULL; ---- nxdesktop/printer.c.orig 2007-01-25 18:32:56.971590702 +0100 -+++ nxdesktop/printer.c 2007-01-25 18:33:43.912193898 +0100 -@@ -108,7 +108,7 @@ - pprinter_data = (PRINTER *) g_rdpdr_device[device_id].pdevice_data; - - /* default printer name use default printer queue as well in unix */ -- if (pprinter_data->printer == "mydeskjet") -+ if (!strcmp(pprinter_data->printer,"mydeskjet")) - { - pprinter_data->printer_fp = popen("lpr", "w"); - } +--- nxcompshad/Makefile.in.orig 2007-11-12 15:10:10.256482000 +0100 ++++ nxcompshad/Makefile.in 2007-11-12 15:11:05.715948000 +0100 +@@ -32,7 +32,7 @@ + + CXX = @CXX@ + CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ +- -Wall -Wpointer-arith ++ -Wall -Wpointer-arith -fPIC + CXXINCLUDES = + CXXDEFINES = + +@@ -43,7 +43,7 @@ + + CC = @CC@ + CCFLAGS = @X_CFLAGS@ @DEFS@ \ +- -Wall -Wpointer-arith ++ -Wall -Wpointer-arith -fPIC + CCINCLUDES = + CCDEFINES = + ++++++ nxagent-2.1.0-20.tar.gz -> nxagent-3.2.0-8.tar.gz ++++++ ++++ 131793 lines of diff (skipped) ++++++ nxcomp-2.1.0-8.tar.gz -> nxcomp-3.2.0-7.tar.gz ++++++ ++++ 33300 lines of diff (skipped) ++++++ nxcompext-2.1.0-5.tar.gz -> nxcompext-3.2.0-1.tar.gz ++++++ ++++ 5642 lines of diff (skipped) ++++++ NX.diff ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:32.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:32.000000000 +0200 @@ -13,31 +13,6 @@ dnl Reset default linking directives. ---- nx-X11/lib/X11/XlcDL.c.old 2004-05-17 15:01:39.385673123 +0000 -+++ nx-X11/lib/X11/XlcDL.c 2004-05-17 15:02:15.963136940 +0000 -@@ -58,10 +58,8 @@ - #ifdef _LP64 - # if defined(__sparcv9) - # define _MACH64_NAME "sparcv9" --# elif defined(__ia64__) --# undef MACH64_NAME - # else --# error "Unknown architecture" -+# undef MACH64_NAME - # endif /* defined(__sparcv9) */ - # ifdef _MACH64_NAME - # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) ---- nxviewer/nxviewer/Imakefile.old 2004-05-31 15:33:45.000000000 +0000 -+++ nxviewer/nxviewer/Imakefile 2004-05-31 15:35:06.000000000 +0000 -@@ -44,6 +44,8 @@ - - USRLIBDIR = ../../nx-X11/exports/lib - -+XPLIB = -+ - #ifdef SunArchitecture - USRLIBDIR = /usr/NX/lib - SUN_LIB = -lX11 -lXext -L/usr/openwin/lib --- nx-X11/programs/Imakefile.old 2004-09-11 03:30:15.738465241 +0200 +++ nx-X11/programs/Imakefile 2004-09-11 03:30:39.661194763 +0200 @@ -125,7 +125,7 @@ ++++++ NX-noansi.diff ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:32.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:32.000000000 +0200 @@ -34,26 +34,3 @@ #include <Library.tmpl> #if DoSharedLib && SharedDataSeparation ---- programs/xedit/lisp/Imakefile.orig 2004-04-19 21:52:42.000000000 +0000 -+++ programs/xedit/lisp/Imakefile 2004-04-19 21:53:11.000000000 +0000 -@@ -98,6 +98,9 @@ - write.o \ - xedit.o - -+#undef DefaultCCOptions -+#define DefaultCCOptions GccWarningOptions -+ - #include <Library.tmpl> - - AllTarget(ProgramTargetName($(SAMP))) ---- programs/Xserver/hw/xfree86/fbdevhw/Imakefile.orig 2004-04-20 02:04:59.000000000 +0000 -+++ programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2004-04-20 02:06:13.000000000 +0000 -@@ -1,6 +1,8 @@ - XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/Imakefile,v 1.11tsi Exp $ - - #define IHaveModules -+#undef DefaultCCOptions -+#define DefaultCCOptions GccWarningOptions - #include <Server.tmpl> - - #if defined(LinuxArchitecture) && LinuxFBDevSupport ++++++ nxproxy-2.1.0-3.tar.gz -> nxproxy-3.2.0-1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/CHANGELOG new/nxproxy/CHANGELOG --- old/nxproxy/CHANGELOG 2007-02-01 15:24:05.000000000 +0100 +++ new/nxproxy/CHANGELOG 2008-04-07 12:19:44.000000000 +0200 @@ -1,19 +1,35 @@ ChangeLog: -nxproxy-2.1.0-3 +nxproxy-3.2.0-1 + +- Opened the 3.2.0 branch based on nxproxy-3.1.0-2. + +nxproxy-3.1.0-2 + +- Updated version number. + +nxproxy-3.1.0-1 + +- Opened the 3.1.0 branch based on nxproxy-3.0.0-4. + +nxproxy-3.0.0-4 + +- Added file COPYING. - Changed the LICENSE file to state that the software is only made available under the version 2 of the GPL. -- Added file COPYING. +nxproxy-3.0.0-3 + +- Updated the copyright notices to year 2007. -nxproxy-2.1.0-2 +nxproxy-3.0.0-2 -- Updated file VERSION. +- Updated the file VERSION. -nxproxy-2.1.0-1 +nxproxy-3.0.0-1 -- Opened the 2.1.0 branch based on nxproxy-2.0.0-2. +- Opened the 3.0.0 branch based on nxproxy-2.0.0-2. nxproxy-2.0.0-2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/LICENSE new/nxproxy/LICENSE --- old/nxproxy/LICENSE 2007-02-01 15:23:04.000000000 +0100 +++ new/nxproxy/LICENSE 2007-05-15 16:56:11.000000000 +0200 @@ -1,7 +1,6 @@ -Copyright (C) 2001, 2006 NoMachine - http://www.nomachine.com/. - -NXPROXY and NX extensions to X are copyright of NoMachine. +Copyright (C) 2001, 2007 NoMachine - http://www.nomachine.com/. +NXPROXY and NX extensions to this software are copyright of NoMachine. Redistribution and use of this software is allowed according to the following terms: @@ -9,22 +8,21 @@ it under the terms of the GNU General Public License Version 2, and not any other version, as published by the Free Software Foundation. -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -Public License for more details. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, Suite -330, Boston, MA 02111-1307 USA +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Parts of this software are derived from DXPC project. These copyright notices apply to original DXPC code: -Redistribution and use in source and binary forms are permitted provi- -ded that the above copyright notice and this paragraph are duplicated -in all such forms. +Redistribution and use in source and binary forms are permitted provided +that the above copyright notice and this paragraph are duplicated in all +such forms. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF @@ -33,6 +31,6 @@ Copyright (c) 1995,1996 Brian Pane Copyright (c) 1996,1997 Zachary Vonler and Brian Pane Copyright (c) 1999 Kevin Vigor and Brian Pane -Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane +Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane All rights reserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/Main.c new/nxproxy/Main.c --- old/nxproxy/Main.c 2006-06-20 17:08:31.000000000 +0200 +++ new/nxproxy/Main.c 2007-01-19 17:34:34.000000000 +0100 @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ /* */ /* NXPROXY, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/VERSION new/nxproxy/VERSION --- old/nxproxy/VERSION 2006-08-02 19:14:58.000000000 +0200 +++ new/nxproxy/VERSION 2008-04-07 12:20:01.000000000 +0200 @@ -1 +1 @@ -2.1.0 +3.2.0 ++++++ nxscripts-2.1.0-5.tar.gz -> nxscripts-3.2.0-1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/CHANGELOG new/nxscripts/CHANGELOG --- old/nxscripts/CHANGELOG 2007-02-01 15:07:47.000000000 +0100 +++ new/nxscripts/CHANGELOG 2008-04-07 11:52:55.000000000 +0200 @@ -1,29 +1,66 @@ ChangeLog: -nxscripts-2.1.0-5 +nxscripts-3.2.0-1 + +- Opened the 3.2.0 branch based on nxscripts-3.1.0-1. + +nxscripts-3.1.0-1 + +- Opened the 3.1.0 branch based on nxscripts-3.0.0-8. + +nxscripts-3.0.0-8 + +- Modified tar-nxclient script by updating the package for Windows. + +nxscripts-3.0.0-7 + +- Added scripts run-nxagent-shadow, tar-nxkill, tar-nxuexec. + +- Fixed run-nxagent script: added nxcompshad dir to the library path. + +- Removed tar-nxshadow script. + +nxscripts-3.0.0-6 + +- Added scripts run-nxagent-windows and run-nxproxy-connect. + +nxscripts-3.0.0-5 + +- Fixed an error in nxreplace. + +- Added script tar-nxshadow. + +nxscripts-3.0.0-4 - Changed the LICENSE file to state that the software is only made available under the version 2 of the GPL. - Added file COPYING. -nxscripts-2.1.0-4 +- Small changes to nxreplace to check exit value of sed. -- Added the tar-nxservice script. +- Addedd nxshadow library to LD_LIBRARY_PATH in run-nxagent. + +nxscripts-3.0.0-3 -nxscripts-2.1.0-3 +- Imported changes up to nxscripts-2.1.0-4. + +- Added the tar-nxservice script. - The tar-nxclient script now correctly rename the tar package using also the CHANGELOG version. -nxscripts-2.1.0-2 - - Reviewed the tar-nxclient script to fetch the nxclient version from the nxclient/VERSION file and consequently update the package. -nxscripts-2.1.0-1 +nxscripts-3.0.0-2 + +- Added the nxagent-service script for running nxagent as NT service + by mean of Cygwin utilities. -- Opened the 2.1.0 branch based on the 2.0.0-2. +nxscripts-3.0.0-1 + +- Opened the 3.0.0 branch based on nxscripts-2.0.0-2. nxscripts-2.0.0-2 @@ -68,7 +105,7 @@ - Added the new nxreplace script. It is a simple script that is used to replace all the occurences of one string with another in a list - of files. + of files. Some examples include: @@ -111,7 +148,7 @@ - Opened 1.4.1 branch. -- New tar-nxspool script. +- New tar-nxspool script. nxscripts-1.4.0-3 @@ -125,7 +162,7 @@ - Note that only the run-nxproxy, run-nxagent and run-nxproxy- reversed have been tested in this release. Others might work with slight changes. - + nxscripts-1.4.0-2 - Added tar-nxcompsh script. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/LICENSE new/nxscripts/LICENSE --- old/nxscripts/LICENSE 2007-02-01 15:05:43.000000000 +0100 +++ new/nxscripts/LICENSE 2007-02-08 16:18:33.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2006 NoMachine - http://www.nomachine.com/. +Copyright (C) 2001, 2007 NoMachine - http://www.nomachine.com/. NXSCRIPTS and NX extensions to X are copyright of NoMachine. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/nxagent-service new/nxscripts/nxagent-service --- old/nxscripts/nxagent-service 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/nxagent-service 2006-10-20 12:12:09.000000000 +0200 @@ -0,0 +1,37 @@ +#!/bin/bash + +#set -x + +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +NX_PORT=9 + +XAUTH=`which xauth` + +${XAUTH} -f /.Xauthority add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +${XAUTH} -f /.Xauthority add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} + +chown SYSTEM:root /.Xauthority + +PATH=${HOME}/NX/nx-X11/exports/bin:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:${HOME}/NX/nxaccess:$PATH + +DISPLAY=nx/nx,link=lan,cookie=${NX_COOKIE},cache=0:${NX_PORT} + +case "$1" in + install) + cygrunsrv -I "NX Agent" -p ${HOME}/NX/nx-X11/programs/Xserver/nxagent.exe \ + -a "-nopersistent -keyboard pc105/it -M :9" -2 ${HOME}/.nx/C-${NX_PORT}/session \ + -i -e "DISPLAY=nx/nx,link=lan,cookie=$NX_COOKIE,errors=${HOME}/errors,cache=0:3" \ + -e "PATH=${PATH}" -e "NX_HOME=${HOME}/.nx" -e "XAUTHORITY=/.Xauthority" + ;; + remove) + cygrunsrv -R "NX Agent" + ;; + start) + rm -f ${HOME}/.nx/C-${NX_PORT}/session >&1 + cygrunsrv -S "NX Agent" + ;; + stop) + cygrunsrv -E "NX Agent" + ;; +esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/nxreplace new/nxscripts/nxreplace --- old/nxscripts/nxreplace 2007-02-01 14:49:25.000000000 +0100 +++ new/nxscripts/nxreplace 2007-02-15 18:59:43.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ @@ -33,7 +33,7 @@ if [ -n "$TEMP" ]; then echo "Using temp dir '$TEMP'"; else - TEMP="/tmp/" + TEMP="/tmp" echo "Using temp dir '$TEMP'"; fi @@ -59,8 +59,14 @@ # this is not needed but will prevent sed error if [ -f "$i" ]; then echo "Patching $i"; - sed 's/"$STR1"/"$STR2"/g' $i > "$TEMP/"$i - mv "$TEMP/"$i $i + TEMPFILE=`mktemp` + if sed "s/$STR1/$STR2/g" $i > $TEMPFILE ; then + chmod --reference=$i $TEMPFILE + mv $TEMPFILE $i + else + echo "Errors occured while patching file $i"; + rm -f $TEMPFILE + fi else echo "Cannot find file $i"; fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent new/nxscripts/run-nxagent --- old/nxscripts/run-nxagent 2007-02-01 15:02:19.000000000 +0100 +++ new/nxscripts/run-nxagent 2007-05-17 13:31:53.000000000 +0200 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ @@ -53,7 +53,9 @@ # Set the path to libraries and NX executables. # -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:${HOME}/NX/nx-X11/exports/lib" +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:\ +${HOME}/NX/nxcompshad:${HOME}/NX/nx-X11/exports/lib" + export LD_LIBRARY_PATH PATH="${PATH}:${HOME}/NX/nxclient/nxclient:${HOME}/NX/nx-X11/programs/Xserver/" @@ -79,7 +81,7 @@ # media=1:1098 # -NX_HOST=nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ +NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=1,cups=1,limit=0,\ accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options @@ -100,7 +102,7 @@ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -nx-X11/programs/Xserver/nxagent -name 'NX' -geometry 800x600+100+100 -fp unix/:7100 \ +nx-X11/programs/Xserver/nxagent -name 'NX' -geometry 800x600+100+100 "$@" \ ${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-client new/nxscripts/run-nxagent-client --- old/nxscripts/run-nxagent-client 2007-02-01 14:49:53.000000000 +0100 +++ new/nxscripts/run-nxagent-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-full new/nxscripts/run-nxagent-full --- old/nxscripts/run-nxagent-full 2007-02-01 14:49:57.000000000 +0100 +++ new/nxscripts/run-nxagent-full 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-nxfs new/nxscripts/run-nxagent-nxfs --- old/nxscripts/run-nxagent-nxfs 2007-02-01 14:50:02.000000000 +0100 +++ new/nxscripts/run-nxagent-nxfs 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-server new/nxscripts/run-nxagent-server --- old/nxscripts/run-nxagent-server 2007-02-01 14:50:06.000000000 +0100 +++ new/nxscripts/run-nxagent-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-shadow new/nxscripts/run-nxagent-shadow --- old/nxscripts/run-nxagent-shadow 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/run-nxagent-shadow 2007-04-30 16:13:41.000000000 +0200 @@ -0,0 +1,107 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + +# +# Uncomment this to enable echo. +# +#set -x +# + +ulimit -c unlimited + +cd ${HOME}/NX + +NX_PORT=9 + +NX_SYSTEM=${HOME}/.nx + +NX_ROOT=${HOME}/.nx + +# +# This should be randlomly generated. +# +#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +# +# Create the directories for the NX session. +# + +rm -rf ${NX_ROOT}/C-${NX_PORT} || exit +mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit + +rm -rf ${HOME}/.nx/S-${NX_PORT} || exit +mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit + +# +# Set the path to libraries and NX executables. +# + +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:\ +${HOME}/NX/nxcompshad:${HOME}/NX/nx-X11/exports/lib" + +export LD_LIBRARY_PATH + +PATH="${PATH}:${HOME}/NX/nxclient/nxclient:${HOME}/NX/nx-X11/programs/Xserver/" +export PATH + +# +# Create the fake cookie for this display. +# + +echo -ne "Creating the X authorization cookie.\n" + +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} + +# +# Options are written in a file 'options' in the session +# directory. The agent will use the DISPLAY settings, so +# we pass in the DISPLAY the name of the options file. +# +# cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, +# accept=62.98.198.1,cookie=$NX_COOKIE, +# id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, +# media=1:1098 +# + +NX_HOST=nx/nx,cache=8192k,link=modem,shadow=$1,\ +accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session + +echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options + +# +# Run the agent. if you don't have a font server running, +# remove the argument "-fp unix/:7100" +# + +NX_AGENT=:${NX_PORT} + +echo -ne "Running the X client side NX agent.\n" + +# SAVED_DISPLAY=$DISPLAY +# +# DISPLAY=nxdev120:0 +# export DISPLAY + +#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ +#valgrind --num-callers=8 --tool=memcheck --leak-check=no --show-reachable=yes --track-fds=no \ +nx-X11/programs/Xserver/nxagent -S -options ${NX_ROOT}/C-${NX_PORT}/options \ +-nopersistent -name 'NX' \ +${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-solaris new/nxscripts/run-nxagent-solaris --- old/nxscripts/run-nxagent-solaris 2007-02-01 14:50:51.000000000 +0100 +++ new/nxscripts/run-nxagent-solaris 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-windows new/nxscripts/run-nxagent-windows --- old/nxscripts/run-nxagent-windows 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/run-nxagent-windows 2007-04-11 19:28:54.000000000 +0200 @@ -0,0 +1,54 @@ +#!/bin/bash + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + +NX_PROJECT_ROOT=${HOME}/NX + +NX_ROOT=${HOME}/.nx + +NX_PORT=3 + +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +PATH=${NX_PROJECT_ROOT}/nxcomp:${NX_PROJECT_ROOT}/nxcompext:\ +${NX_PROJECT_ROOT}/nxcompshad:${NX_PROJECT_ROOT}/nx-X11/exports/bin:$PATH + +export PATH + +rm -rf ${NX_ROOT}/C-${NX_PORT} + +mkdir -p ${NX_ROOT}/C-${NX_PORT} + +NX_HOST=nx/nx,cache=8M,images=32M,link=modem,\ +cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session + +echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options + +DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} + +export DISPLAY + +echo -ne "Creating the X authorization cookie.\n" + +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} + +echo -ne "Running X agent on display :${NX_PORT}.\n" + +${NX_PROJECT_ROOT}/nx-X11/programs/Xserver/nxagent \ +-S -geometry 800x600 -nopersistent :${NX_PORT} 2> ${NX_ROOT}/C-${NX_PORT}/session & diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxdesktop new/nxscripts/run-nxdesktop --- old/nxscripts/run-nxdesktop 2007-02-01 14:50:36.000000000 +0100 +++ new/nxscripts/run-nxdesktop 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxdesktop-client new/nxscripts/run-nxdesktop-client --- old/nxscripts/run-nxdesktop-client 2007-02-01 14:51:05.000000000 +0100 +++ new/nxscripts/run-nxdesktop-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxdesktop-server new/nxscripts/run-nxdesktop-server --- old/nxscripts/run-nxdesktop-server 2007-02-01 14:51:21.000000000 +0100 +++ new/nxscripts/run-nxdesktop-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy new/nxscripts/run-nxproxy --- old/nxscripts/run-nxproxy 2007-02-01 14:51:31.000000000 +0100 +++ new/nxscripts/run-nxproxy 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-client new/nxscripts/run-nxproxy-client --- old/nxscripts/run-nxproxy-client 2007-02-01 14:51:38.000000000 +0100 +++ new/nxscripts/run-nxproxy-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-connect new/nxscripts/run-nxproxy-connect --- old/nxscripts/run-nxproxy-connect 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/run-nxproxy-connect 2007-04-11 20:11:21.000000000 +0200 @@ -0,0 +1,34 @@ +#!/bin/bash + +NX_PROJECT_ROOT=${HOME}/NX + +NX_ROOT=${HOME}/.nx + +NX_PORT=3 + +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +# Change this into the host to connect to. + +REMOTE_HOST=nxtest04 + +NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=${REMOTE_HOST},cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session + +cd ${NX_PROJECT_ROOT} + +rm -rf ${NX_ROOT}/S-${NX_PORT} +mkdir -p ${NX_ROOT}/S-${NX_PORT} + +echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options + +echo -ne "Running the X server side NX proxy.\n" + +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${NX_PROJECT_ROOT}/nxcomp:${NX_PROJECT_ROOT}/nxcompext:\ +${NX_PROJECT_ROOT}/NX/nxcompshad:${NX_PROJECT_ROOT}/NX/nx-X11/exports/lib" + +export LD_LIBRARY_PATH + +nxproxy/nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} 2> ${HOME}/.nx/S-${NX_PORT}/session & + +echo -ne "Session running on display :$NX_PORT.\n" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-reversed new/nxscripts/run-nxproxy-reversed --- old/nxscripts/run-nxproxy-reversed 2007-02-01 14:51:43.000000000 +0100 +++ new/nxscripts/run-nxproxy-reversed 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-server new/nxscripts/run-nxproxy-server --- old/nxscripts/run-nxproxy-server 2007-02-01 14:51:46.000000000 +0100 +++ new/nxscripts/run-nxproxy-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-thread new/nxscripts/run-nxproxy-thread --- old/nxscripts/run-nxproxy-thread 2007-02-01 14:51:55.000000000 +0100 +++ new/nxscripts/run-nxproxy-thread 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxviewer new/nxscripts/run-nxviewer --- old/nxscripts/run-nxviewer 2007-02-01 14:51:58.000000000 +0100 +++ new/nxscripts/run-nxviewer 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxviewer-client new/nxscripts/run-nxviewer-client --- old/nxscripts/run-nxviewer-client 2007-02-01 14:52:01.000000000 +0100 +++ new/nxscripts/run-nxviewer-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxviewer-server new/nxscripts/run-nxviewer-server --- old/nxscripts/run-nxviewer-server 2007-02-01 14:52:04.000000000 +0100 +++ new/nxscripts/run-nxviewer-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-x11perf new/nxscripts/run-x11perf --- old/nxscripts/run-x11perf 2007-02-01 14:52:24.000000000 +0100 +++ new/nxscripts/run-x11perf 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxagent new/nxscripts/tar-nxagent --- old/nxscripts/tar-nxagent 2007-02-01 14:52:28.000000000 +0100 +++ new/nxscripts/tar-nxagent 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxauth new/nxscripts/tar-nxauth --- old/nxscripts/tar-nxauth 2007-02-01 14:52:31.000000000 +0100 +++ new/nxscripts/tar-nxauth 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxauth-org new/nxscripts/tar-nxauth-org --- old/nxscripts/tar-nxauth-org 2007-02-01 14:52:34.000000000 +0100 +++ new/nxscripts/tar-nxauth-org 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxclient new/nxscripts/tar-nxclient --- old/nxscripts/tar-nxclient 2007-02-01 14:52:40.000000000 +0100 +++ new/nxscripts/tar-nxclient 2007-09-12 19:51:17.000000000 +0200 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ @@ -79,10 +79,7 @@ sed -e 's|NXCLIENT_VERSION=.*$|NXCLIENT_VERSION=\\\"'${version}'\\\"|g' nxclient.pro > nxclient.pro.sed || exit 1 mv nxclient.pro.sed nxclient.pro || exit 1 - sed -e 's|AppVersion=.*$|AppVersion='${version}'\r|g' nxclient.iss > nxclient.iss.sed || exit 1 - mv nxclient.iss.sed nxclient.iss || exit 1 - - sed -e 's|AppVerName=NX Client for Windows.*$|AppVerName=NX Client for Windows '${version}'\r|g' nxclient.iss > nxclient.iss.sed || exit 1 + sed -e 's|\#define\ AppVersion .*$|\#define AppVersion '\"${version}\"'\r|g' nxclient.iss > nxclient.iss.sed || exit 1 mv nxclient.iss.sed nxclient.iss || exit 1 sed -e 's|const char \*NX_CLIENT_VERSION =.*$|const char *NX_CLIENT_VERSION = \"'${version}'\";|g' NXClientVersion.h > NXClientVersion.h.sed || exit 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcomp new/nxscripts/tar-nxcomp --- old/nxscripts/tar-nxcomp 2007-02-01 14:52:43.000000000 +0100 +++ new/nxscripts/tar-nxcomp 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcompext new/nxscripts/tar-nxcompext --- old/nxscripts/tar-nxcompext 2007-02-01 14:52:46.000000000 +0100 +++ new/nxscripts/tar-nxcompext 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcompsh new/nxscripts/tar-nxcompsh --- old/nxscripts/tar-nxcompsh 2007-02-01 14:52:49.000000000 +0100 +++ new/nxscripts/tar-nxcompsh 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcompshad new/nxscripts/tar-nxcompshad --- old/nxscripts/tar-nxcompshad 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/tar-nxcompshad 2007-04-06 16:26:31.000000000 +0200 @@ -0,0 +1,108 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + + +PROJECT=nxcompshad +TEMPORARY=t +SUFFIX=XXX + + +if [ `uname` = "SunOS" ] ; then + TAR=gtar + CP="cp -r" +elif [ `uname` = "Darwin" ] ; then + TAR=tar + CP="cp -RPp" +else + TAR=tar + CP="cp -a" +fi + + + +if [ $1 ] ; then + SUFFIX=$1 + if [ -f ${PROJECT}-${SUFFIX}.tar.gz ] ; then + echo -ne "Release file ${PROJECT}-${SUFFIX}.tar.gz exists.\n" + exit 1 + fi +fi + +cd ../NX 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Change directory to 'NX' project home and retry.\n" + exit 1 + fi + +if [ ! -d ${PROJECT} ] ; then + echo -ne "Can't find '${PROJECT}' project files.\n" + exit 1 +fi + +if [ -f ${TEMPORARY} ] ; then + echo -ne "Please remove file '${TEMPORARY}' and retry.\n" + exit 1 +fi + +if [ -d ${TEMPORARY} ] ; then + echo -ne "Removing temporary directory '${TEMPORARY}'...\n" + rm -rf ${TEMPORARY} 2>/dev/null +fi + +mkdir ${TEMPORARY} 2>/dev/null + +# +# Copy all files pertaining to ${PROJECT} +# to a temporary directory. +# + +echo -ne "Copying '${PROJECT}' project files to '${TEMPORARY}'...\n" + +cd ${TEMPORARY} 2>/dev/null || exit 1 + +$CP ../${PROJECT} . || exit 1 + +# +# Make a distclean in copy of project's directory. +# + +cd ${PROJECT} || exit 1 + +echo -ne "Making distclean in '${TEMPORARY}/${PROJECT}'...\n" + +make distclean 1>/dev/null 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Distclean failed. Check you have successfully built\n" + echo -ne "the project and have such target in your makefile.\n" + exit 1 + fi + +cd .. + +# +# Make the tarfile. +# + +echo -ne "Making '${PROJECT}' tar file from '${TEMPORARY}'...\n" + +$TAR zcf ../${PROJECT}-${SUFFIX}.tar.gz ${PROJECT} || exit 1 + +if [ -e $1 ] ; then + echo -ne "Please now rename file '${PROJECT}-${SUFFIX}.tar.gz' to your version number.\n" +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxdarwin new/nxscripts/tar-nxdarwin --- old/nxscripts/tar-nxdarwin 2007-02-01 14:52:52.000000000 +0100 +++ new/nxscripts/tar-nxdarwin 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxdesktop new/nxscripts/tar-nxdesktop --- old/nxscripts/tar-nxdesktop 2007-02-01 14:52:54.000000000 +0100 +++ new/nxscripts/tar-nxdesktop 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxesd new/nxscripts/tar-nxesd --- old/nxscripts/tar-nxesd 2007-02-01 14:52:57.000000000 +0100 +++ new/nxscripts/tar-nxesd 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxkbd new/nxscripts/tar-nxkbd --- old/nxscripts/tar-nxkbd 2007-02-01 14:53:00.000000000 +0100 +++ new/nxscripts/tar-nxkbd 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxkdrive new/nxscripts/tar-nxkdrive --- old/nxscripts/tar-nxkdrive 2007-02-01 14:53:03.000000000 +0100 +++ new/nxscripts/tar-nxkdrive 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxkill new/nxscripts/tar-nxkill --- old/nxscripts/tar-nxkill 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/tar-nxkill 2007-05-16 16:24:02.000000000 +0200 @@ -0,0 +1,108 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + + +PROJECT=nxkill +TEMPORARY=t +SUFFIX=XXX + + +if [ `uname` = "SunOS" ] ; then + TAR=gtar + CP="cp -r" +elif [ `uname` = "Darwin" ] ; then + TAR=tar + CP="cp -RPp" +else + TAR=tar + CP="cp -a" +fi + + + +if [ $1 ] ; then + SUFFIX=$1 + if [ -f ${PROJECT}-${SUFFIX}.tar.gz ] ; then + echo -ne "Release file ${PROJECT}-${SUFFIX}.tar.gz exists.\n" + exit 1 + fi +fi + +cd ../NX 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Change directory to 'NX' project home and retry.\n" + exit 1 + fi + +if [ ! -d ${PROJECT} ] ; then + echo -ne "Can't find '${PROJECT}' project files.\n" + exit 1 +fi + +if [ -f ${TEMPORARY} ] ; then + echo -ne "Please remove file '${TEMPORARY}' and retry.\n" + exit 1 +fi + +if [ -d ${TEMPORARY} ] ; then + echo -ne "Removing temporary directory '${TEMPORARY}'...\n" + rm -rf ${TEMPORARY} 2>/dev/null +fi + +mkdir ${TEMPORARY} 2>/dev/null + +# +# Copy all files pertaining to ${PROJECT} +# to a temporary directory. +# + +echo -ne "Copying '${PROJECT}' project files to '${TEMPORARY}'...\n" + +cd ${TEMPORARY} 2>/dev/null || exit 1 + +$CP ../${PROJECT} . || exit 1 + +# +# Make a distclean in copy of project's directory. +# + +cd ${PROJECT} || exit 1 + +echo -ne "Making distclean in '${TEMPORARY}/${PROJECT}'...\n" + +make distclean 1>/dev/null 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Distclean failed. Check you have successfully built\n" + echo -ne "the project and have such target in your makefile.\n" + exit 1 + fi + +cd .. + +# +# Make the tarfile. +# + +echo -ne "Making '${PROJECT}' tar file from '${TEMPORARY}'...\n" + +$TAR zcf ../${PROJECT}-${SUFFIX}.tar.gz ${PROJECT} || exit 1 + +if [ -e $1 ] ; then + echo -ne "Please now rename file '${PROJECT}-${SUFFIX}.tar.gz' to your version number.\n" +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxproxy new/nxscripts/tar-nxproxy --- old/nxscripts/tar-nxproxy 2007-02-01 14:53:06.000000000 +0100 +++ new/nxscripts/tar-nxproxy 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxscripts new/nxscripts/tar-nxscripts --- old/nxscripts/tar-nxscripts 2007-02-01 14:53:08.000000000 +0100 +++ new/nxscripts/tar-nxscripts 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxsensor new/nxscripts/tar-nxsensor --- old/nxscripts/tar-nxsensor 2007-02-01 14:53:53.000000000 +0100 +++ new/nxscripts/tar-nxsensor 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxservice new/nxscripts/tar-nxservice --- old/nxscripts/tar-nxservice 2007-02-01 14:53:56.000000000 +0100 +++ new/nxscripts/tar-nxservice 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxspool new/nxscripts/tar-nxspool --- old/nxscripts/tar-nxspool 2007-02-01 14:53:58.000000000 +0100 +++ new/nxscripts/tar-nxspool 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxssh new/nxscripts/tar-nxssh --- old/nxscripts/tar-nxssh 2007-02-01 14:54:01.000000000 +0100 +++ new/nxscripts/tar-nxssh 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxsync new/nxscripts/tar-nxsync --- old/nxscripts/tar-nxsync 2007-02-01 14:54:04.000000000 +0100 +++ new/nxscripts/tar-nxsync 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxuexec new/nxscripts/tar-nxuexec --- old/nxscripts/tar-nxuexec 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/tar-nxuexec 2007-05-16 16:24:18.000000000 +0200 @@ -0,0 +1,108 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + + +PROJECT=nxuexec +TEMPORARY=t +SUFFIX=XXX + + +if [ `uname` = "SunOS" ] ; then + TAR=gtar + CP="cp -r" +elif [ `uname` = "Darwin" ] ; then + TAR=tar + CP="cp -RPp" +else + TAR=tar + CP="cp -a" +fi + + + +if [ $1 ] ; then + SUFFIX=$1 + if [ -f ${PROJECT}-${SUFFIX}.tar.gz ] ; then + echo -ne "Release file ${PROJECT}-${SUFFIX}.tar.gz exists.\n" + exit 1 + fi +fi + +cd ../NX 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Change directory to 'NX' project home and retry.\n" + exit 1 + fi + +if [ ! -d ${PROJECT} ] ; then + echo -ne "Can't find '${PROJECT}' project files.\n" + exit 1 +fi + +if [ -f ${TEMPORARY} ] ; then + echo -ne "Please remove file '${TEMPORARY}' and retry.\n" + exit 1 +fi + +if [ -d ${TEMPORARY} ] ; then + echo -ne "Removing temporary directory '${TEMPORARY}'...\n" + rm -rf ${TEMPORARY} 2>/dev/null +fi + +mkdir ${TEMPORARY} 2>/dev/null + +# +# Copy all files pertaining to ${PROJECT} +# to a temporary directory. +# + +echo -ne "Copying '${PROJECT}' project files to '${TEMPORARY}'...\n" + +cd ${TEMPORARY} 2>/dev/null || exit 1 + +$CP ../${PROJECT} . || exit 1 + +# +# Make a distclean in copy of project's directory. +# + +cd ${PROJECT} || exit 1 + +echo -ne "Making distclean in '${TEMPORARY}/${PROJECT}'...\n" + +make distclean 1>/dev/null 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Distclean failed. Check you have successfully built\n" + echo -ne "the project and have such target in your makefile.\n" + exit 1 + fi + +cd .. + +# +# Make the tarfile. +# + +echo -ne "Making '${PROJECT}' tar file from '${TEMPORARY}'...\n" + +$TAR zcf ../${PROJECT}-${SUFFIX}.tar.gz ${PROJECT} || exit 1 + +if [ -e $1 ] ; then + echo -ne "Please now rename file '${PROJECT}-${SUFFIX}.tar.gz' to your version number.\n" +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxviewer new/nxscripts/tar-nxviewer --- old/nxscripts/tar-nxviewer 2007-02-01 14:54:07.000000000 +0100 +++ new/nxscripts/tar-nxviewer 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxwin new/nxscripts/tar-nxwin --- old/nxscripts/tar-nxwin 2007-02-01 14:54:10.000000000 +0100 +++ new/nxscripts/tar-nxwin 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxwin-org new/nxscripts/tar-nxwin-org --- old/nxscripts/tar-nxwin-org 2007-02-01 14:54:12.000000000 +0100 +++ new/nxscripts/tar-nxwin-org 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11 new/nxscripts/tar-nx-X11 --- old/nxscripts/tar-nx-X11 2007-02-01 14:54:15.000000000 +0100 +++ new/nxscripts/tar-nx-X11 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11-org new/nxscripts/tar-nx-X11-org --- old/nxscripts/tar-nx-X11-org 2007-02-01 14:54:18.000000000 +0100 +++ new/nxscripts/tar-nx-X11-org 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11-org-updated new/nxscripts/tar-nx-X11-org-updated --- old/nxscripts/tar-nx-X11-org-updated 2007-02-01 14:54:29.000000000 +0100 +++ new/nxscripts/tar-nx-X11-org-updated 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11-updated new/nxscripts/tar-nx-X11-updated --- old/nxscripts/tar-nx-X11-updated 2007-02-01 14:54:34.000000000 +0100 +++ new/nxscripts/tar-nx-X11-updated 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/update-NX new/nxscripts/update-NX --- old/nxscripts/update-NX 2007-02-01 14:54:51.000000000 +0100 +++ new/nxscripts/update-NX 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ ++++++ nx-X11-2.1.0-3.tar.gz -> nx-X11-3.2.0-2.tar.gz ++++++ NX/nx-X11-2.1.0-3.tar.gz /mounts/work_src_done/STABLE/NX/nx-X11-3.2.0-2.tar.gz differ: byte 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org