commit c9fcef1b6aeee2c13822b8bb066247db62d51fff Author: Rosa Date: Wed Feb 1 21:32:35 2012 +0400 Automatic import for version 3.3.0 diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..038f9aa --- /dev/null +++ b/.abf.yml @@ -0,0 +1,10 @@ +sources: + "nx-X11-3.3.0-6.tar.gz": 79408d3c11640c331110184da3afda5b8bc41730 + "nxagent-3.3.0-13.tar.gz": 6a9d26f01954d00b3b1976617b7ae8ce05e669d4 + "nxauth-3.3.0-1.tar.gz": d8826654066e4a34ecf6ad903591e76924683d21 + "nxcomp-3.3.0-4.tar.gz": b332a35f8db652d6d54281d31d932b5cbfbc0adf + "nxcompext-3.3.0-4.tar.gz": fc4df51d0e45391cbe9025d1fd21b7a33116c026 + "nxcompshad-3.3.0-3.tar.gz": 2a55519bee2a8b8fa5a6573904d3b098792cf51f + "nxproxy-3.3.0-2.tar.gz": 3703e4e5d9097c54b34190fc2a17208385ec7533 + "nxssh-3.3.0-1.tar.gz": bca3771af0aa8fcc80bca867c5d8bbd646c9429a + "nxwin-3.3.0-2.tar.gz": e4ea47f1bfa4e20914412e1f6b4bbafa6061a0d2 diff --git a/GUUG-Presentation-NX.pdf b/GUUG-Presentation-NX.pdf new file mode 100644 index 0000000..2db050f Binary files /dev/null and b/GUUG-Presentation-NX.pdf differ diff --git a/nx-3.3.0-nxcomp-glibc2.10.patch b/nx-3.3.0-nxcomp-glibc2.10.patch new file mode 100644 index 0000000..12267c7 --- /dev/null +++ b/nx-3.3.0-nxcomp-glibc2.10.patch @@ -0,0 +1,11 @@ +--- Loop.cpp.orig 2009-07-06 12:38:10.000000000 +0200 ++++ Loop.cpp 2009-07-06 12:38:14.000000000 +0200 +@@ -10979,7 +10979,7 @@ + packMethod == PACK_LOSSLESS || + packMethod == PACK_ADAPTIVE) + { +- char *dash = rindex(opt, '-'); ++ const char *dash = rindex(opt, '-'); + + if (dash != NULL && strlen(dash) == 2 && + *(dash + 1) >= '0' && *(dash + 1) <= '9') diff --git a/nx-X11-3.1-libdir.patch b/nx-X11-3.1-libdir.patch new file mode 100644 index 0000000..40ccfb9 --- /dev/null +++ b/nx-X11-3.1-libdir.patch @@ -0,0 +1,187 @@ +diff -BrauN nx-X11.orig/config/cf/X11.tmpl nx-X11/config/cf/X11.tmpl +--- nx-X11.orig/config/cf/X11.tmpl 2005-12-14 23:41:52.000000000 +0000 ++++ nx-X11/config/cf/X11.tmpl 2008-01-26 21:00:56.000000000 +0000 +@@ -512,7 +512,7 @@ + #define XprtServer (BuildServer && BuildXprint) + #endif + #ifndef BuildXprintLib +-#define BuildXprintLib (!BuildServersOnly && BuildXprint) ++#define BuildXprintLib YES + #endif + #ifndef BuildXprintClients + #define BuildXprintClients BuildXprintLib +diff -BrauN nx-X11.orig/lib/X11/Imakefile nx-X11/lib/X11/Imakefile +--- nx-X11.orig/lib/X11/Imakefile 2007-06-04 08:19:12.000000000 +0000 ++++ nx-X11/lib/X11/Imakefile 2008-01-26 18:56:23.000000000 +0000 +@@ -83,7 +83,7 @@ + #define DoExtraLib SharedLibX11 + #define DoDebugLib DebugLibX11 + #define DoProfileLib ProfileLibX11 +-#define LibName X11 ++#define LibName X11-nx + #define SoRev SOXLIBREV + #define HugeLibrary YES + #define IncSubdir X11 +diff -BrauN nx-X11.orig/lib/X11/xlibi18n/im/ximcp/Imakefile nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile +--- nx-X11.orig/lib/X11/xlibi18n/im/ximcp/Imakefile 2004-04-23 18:43:35.000000000 +0000 ++++ nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2008-01-26 19:00:36.000000000 +0000 +@@ -15,7 +15,7 @@ + + CONN_DEFINES = ConnectionFlags + XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc + + LinkSourceFile(imCallbk.c, ../../..) + LinkSourceFile(imDefFlt.c, ../../..) +diff -BrauN nx-X11.orig/lib/X11/xlibi18n/lc/Utf8/Imakefile nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile +--- nx-X11.orig/lib/X11/xlibi18n/lc/Utf8/Imakefile 2004-04-23 18:43:35.000000000 +0000 ++++ nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2008-01-26 19:02:10.000000000 +0000 +@@ -6,7 +6,7 @@ + XI18NLIBNAME = xlibi18n + SRCS = lcUTF8Load.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc + + LinkSourceFile(lcUTF8Load.c, ../../..) + +diff -BrauN nx-X11.orig/lib/X11/xlibi18n/lc/def/Imakefile nx-X11/lib/X11/xlibi18n/lc/def/Imakefile +--- nx-X11.orig/lib/X11/xlibi18n/lc/def/Imakefile 2004-04-23 18:43:35.000000000 +0000 ++++ nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2008-01-26 19:01:24.000000000 +0000 +@@ -6,7 +6,7 @@ + XI18NLIBNAME = xlcDef + SRCS = lcDefConv.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc + + LinkSourceFile(lcDefConv.c, ../../..) + +diff -BrauN nx-X11.orig/lib/X11/xlibi18n/lc/gen/Imakefile nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile +--- nx-X11.orig/lib/X11/xlibi18n/lc/gen/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2008-01-26 19:01:35.000000000 +0000 +@@ -6,7 +6,7 @@ + XI18NLIBNAME = xlibi18n + SRCS = lcGenConv.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc + + LinkSourceFile(lcGenConv.c, ../../..) + +diff -BrauN nx-X11.orig/lib/X11/xlibi18n/lc/xlocale/Imakefile nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile +--- nx-X11.orig/lib/X11/xlibi18n/lc/xlocale/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2008-01-26 19:01:03.000000000 +0000 +@@ -6,7 +6,7 @@ + XI18NLIBNAME = xlocale + SRCS = lcEuc.c lcSjis.c lcJis.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc + + LinkSourceFile(lcEuc.c, ../../..) + LinkSourceFile(lcSjis.c, ../../..) +diff -BrauN nx-X11.orig/lib/X11/xlibi18n/om/generic/Imakefile nx-X11/lib/X11/xlibi18n/om/generic/Imakefile +--- nx-X11.orig/lib/X11/xlibi18n/om/generic/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2008-01-26 18:59:45.000000000 +0000 +@@ -7,7 +7,7 @@ + omTextEsc.c omTextExt.c omTextPer.c omXChar.c + + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc + + LinkSourceFile(omDefault.c, ../../..) + LinkSourceFile(omGeneric.c, ../../..) +diff -BrauN nx-X11.orig/lib/Xaw/Imakefile nx-X11/lib/Xaw/Imakefile +--- nx-X11.orig/lib/Xaw/Imakefile 2004-09-02 01:10:29.000000000 +0000 ++++ nx-X11/lib/Xaw/Imakefile 2008-01-26 18:51:53.000000000 +0000 +@@ -198,6 +198,9 @@ + XawI18n.o \ + XawInit.o + ++#undef DefaultCCOptions ++#define DefaultCCOptions GccWarningOptions ++ + #include + + #if DoSharedLib && SharedDataSeparation +diff -BrauN nx-X11.orig/lib/Xaw6/Imakefile nx-X11/lib/Xaw6/Imakefile +--- nx-X11.orig/lib/Xaw6/Imakefile 2004-04-23 18:43:40.000000000 +0000 ++++ nx-X11/lib/Xaw6/Imakefile 2008-01-26 18:52:31.000000000 +0000 +@@ -115,6 +115,8 @@ + + INCLUDES = -I$(AWIDGETSRC) + ++#undef DefaultCCOptions ++#define DefaultCCOptions GccWarningOptions + #include + + #if DoSharedLib && SharedDataSeparation +diff -BrauN nx-X11.orig/lib/Xext/Imakefile nx-X11/lib/Xext/Imakefile +--- nx-X11.orig/lib/Xext/Imakefile 2004-08-16 15:02:59.000000000 +0000 ++++ nx-X11/lib/Xext/Imakefile 2008-01-26 18:53:33.000000000 +0000 +@@ -10,14 +10,14 @@ + #define DoExtraLib SharedLibXext + #define DoDebugLib DebugLibXext + #define DoProfileLib ProfileLibXext +-#define LibName Xext ++#define LibName Xext-nx + #define SoRev SOXEXTREV + #define LibHeaders NO + + #include + + #ifdef SharedXextReqs +-REQUIREDLIBS = SharedXextReqs ++REQUIREDLIBS = -L../../exports/lib/ -lX11-nx SharedXextReqs + #endif + + #if HasShm +diff -BrauN nx-X11.orig/lib/Xrender/Imakefile nx-X11/lib/Xrender/Imakefile +--- nx-X11.orig/lib/Xrender/Imakefile 2004-08-07 00:40:40.000000000 +0000 ++++ nx-X11/lib/Xrender/Imakefile 2008-01-26 18:55:39.000000000 +0000 +@@ -74,7 +74,7 @@ + #define DoSharedLib SharedLibXrender + #define DoDebugLib DebugLibXrender + #define DoProfileLib ProfileLibXrender +-#define LibName Xrender ++#define LibName Xrender-nx + #define SoRev SOXRENDERREV + + #ifdef XBuildIncDir +@@ -89,7 +89,7 @@ + #include + + #ifdef SharedXrenderReqs +-REQUIREDLIBS = SharedXrenderReqs ++REQUIREDLIBS = $(LDPRELIB) -L../../exports/lib/ -lXext-nx -lX11-nx + #endif + + #if Malloc0ReturnsNull +diff -BrauN nx-X11.orig/lib/Xxf86dga/Imakefile nx-X11/lib/Xxf86dga/Imakefile +--- nx-X11.orig/lib/Xxf86dga/Imakefile 2005-10-18 14:58:52.000000000 +0000 ++++ nx-X11/lib/Xxf86dga/Imakefile 2008-01-26 19:02:50.000000000 +0000 +@@ -34,6 +34,9 @@ + + #define IncludeSharedObjectInNormalLib + ++#undef DefaultCCOptions ++#define DefaultCCOptions GccWarningOptions ++ + #include + + InstallGenManPage(XDGA,$(LIBMANDIR),$(LIBMANSUFFIX)) +diff -BrauN nx-X11.orig/programs/Xserver/Imakefile nx-X11/programs/Xserver/Imakefile +--- nx-X11.orig/programs/Xserver/Imakefile 2007-09-03 17:20:32.000000000 +0000 ++++ nx-X11/programs/Xserver/Imakefile 2008-01-26 19:06:48.000000000 +0000 +@@ -997,7 +997,7 @@ + XPMLIB = -lXpm + NXAGENT = hw/nxagent/LibraryTargetName(nxagent) + NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) +-NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) ++NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB) + #if HasParallelMake + MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS)) + #endif diff --git a/nx-X11-fix-format-errors.patch b/nx-X11-fix-format-errors.patch new file mode 100644 index 0000000..af484cd --- /dev/null +++ b/nx-X11-fix-format-errors.patch @@ -0,0 +1,12 @@ +diff -Naur nx-X11/config/imake/imake.c nx-X11-fix-format-errors/config/imake/imake.c +--- nx-X11/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100 ++++ nx-X11-fix-format-errors/config/imake/imake.c 2009-03-04 22:25:31.000000000 +0100 +@@ -1015,7 +1015,7 @@ + abort (); + + while (fgets (command, len, fp)) +- fprintf (inFile, command); ++ fprintf (inFile, "%s", command); + + len = pclose (fp); + remove (aout); diff --git a/nx.spec b/nx.spec new file mode 100644 index 0000000..92b2ab0 --- /dev/null +++ b/nx.spec @@ -0,0 +1,419 @@ +# most of the descriptions are stolen from the debian package + +Summary: NoMachine NX +Name: nx +Version: 3.3.0 +Release: %mkrel 3 +Source0: nx-X11-%{version}-6.tar.gz +Source1: nxagent-%{version}-13.tar.gz +Source2: nxauth-%{version}-1.tar.gz +Source4: nxcompext-%{version}-4.tar.gz +Source5: nxcompshad-%{version}-3.tar.gz +Source6: nxwin-%{version}-2.tar.gz +Source7: nxcomp-%{version}-4.tar.gz +Source8: nxproxy-%{version}-2.tar.gz +Source9: nxssh-%{version}-1.tar.gz + +Source10: GUUG-Presentation-NX.pdf + +# rename libs with nx prefix => allow us to put them in %{_libdir} (from debian) +# rediffed for 2.0 +Patch0: nx-X11-3.1-libdir.patch +Patch1: nx-X11-fix-format-errors.patch +Patch2: nxssh-fix-format-errors.patch +Patch3: nx-3.3.0-nxcomp-glibc2.10.patch +License: GPLv2+ and MIT +Group: Networking/Remote access +URL: http://www.nomachine.com/sources.php +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: X11-devel +BuildRequires: libfontconfig-devel +BuildRequires: zlib-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +#BuildRequires: automake1.7, automake1.4 +BuildRequires: openssl-devel +BuildRequires: imake + +%description +NoMachine NX is the next-generation X compression and roundtrip +suppression scheme. It can operate remote X11 sessions over +56k modem dialup links or anything better. + +#################### +# xcompext lib # +#################### +%define lib_name_orig_xcompext libxcompext +%define lib_major_xcompext 3 +%define lib_name_xcompext %mklibname xcompext %{lib_major_xcompext} +%package -n %{lib_name_xcompext} +Summary: Xcompext/Xcompshad library for NX +Group: System/Libraries +Provides: xcompext = %{version}-%{release} +Provides: xcompshad = %{version}-%{release} + +%description -n %{lib_name_xcompext} +Xcompext and Xcompshad library needed by the NX framework + +%if %mdkversion < 200900 +%post -n %{lib_name_xcompext} -p /sbin/ldconfig +%endif +%postun -n %{lib_name_xcompext} +%if %mdkversion < 200900 +/sbin/ldconfig +%endif + + +############### +# nx-X11 lib # +############### +%define lib_name_orig_nxx11 libnxX11 +%define lib_major_nxx11 0 +%define lib_name_nxx11 %mklibname nxX11_ %{lib_major_nxx11} +%package -n %{lib_name_nxx11} +Summary: Nx-X11 lib for NX +Group: System/Libraries +Provides: nxX11 = %{version}-%{release} + +%description -n %{lib_name_nxx11} +NX-X11 lib for the NX framework + +%if %mdkversion < 200900 +%post -n %{lib_name_nxx11} -p /sbin/ldconfig +%endif +%postun -n %{lib_name_nxx11} +%if %mdkversion < 200900 +/sbin/ldconfig +%endif + +########## +# nxcomp # +########## +%define lib_name_orig_nxcomp libxcomp +%define lib_major_nxcomp 3 +%define lib_name_nxcomp %mklibname xcomp %{lib_major_nxcomp} + +%package -n %{lib_name_nxcomp} +Summary: Xcomp library for NX +Group: System/Libraries +Provides: xcomp = %{version}-%{release} + +%description -n %{lib_name_nxcomp} +Xcomp library for NX subsystem + +%if %mdkversion < 200900 +%post -n %{lib_name_nxcomp} -p /sbin/ldconfig +%endif +%postun -n %{lib_name_nxcomp} +%if %mdkversion < 200900 +/sbin/ldconfig +%endif + +########### +# nxproxy # +########### +%package -n nxproxy +Summary: Provide the protocol compression and caching part of the NX scheme +Group: Networking/Remote access + +%description -n nxproxy +The nxproxy runs on the X server side of the wire and thus accompanies +the nxagent running on X client side. It provides the protocol +compression and caching part of the NX scheme. + +########### +# nxagent # +########### +%package -n nxagent +Summary: NX X server based on Xnest +Group: Networking/Remote access + +%description -n nxagent +The nxagent is an X server based on Xnest, but modified +for the purpose of reducing roundtrips over high-latency +networks significantly. It is run on the client side of X, +that is, on the machine where X clients run. It connects, +over the wire, to your regular X server, possibly through nxproxy. + +######### +# nxssh # +######### + +%package -n nxssh +Summary: NX ssh client +Group: Networking/Remote access + +%description -n nxssh +Nx ssh client + +%prep +%setup -q -c -a 1 -a 2 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 +%patch0 -p 0 +%patch1 -p 0 +%patch2 -p 0 + +pushd nxcomp +%patch3 -p0 +popd + +%build +# documentation explainig how NX works +cp %{SOURCE10} ./ + +# the build system Sux, or I haven't understand how it works +# We must build all the lib, and somes binaries at the same shot +# because -I ../nxFOO <-- It *sux* + +#-------- Build nxcomp + +pushd nxcomp +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +export CPPFLAGS="%{optflags} -fPIC" +%configure2_5x +# configure script doesn't care of CFLAGS +perl -pi -e "s/CXXFLAGS = -O3/CXXFLAGS = %{optflags} -fPIC/" Makefile +perl -pi -e "s/LDFLAGS = /LDFLAGS = -fPIC/" Makefile +perl -pi -e "s/CCFLAGS\s+=/CCFLAGS = %{optflags} -fPIC/" Makefile +make clean +%make +popd + +#-------- build nxcompext lib +pushd nxcompext +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +export CPPFLAGS="%{optflags} -fPIC" +%configure2_5x +perl -pi -e "s/CXXFLAGS = -O3/CXXFLAGS = %{optflags} -fPIC/" Makefile +perl -pi -e "s|LDFLAGS = |LDFLAGS = -fPIC -L/usr/X11R6/%{_lib}|" Makefile +make clean +%make +popd + +#-------- build nxcompshad lib +pushd nxcompshad +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +export CPPFLAGS="%{optflags} -fPIC" +%configure2_5x +perl -pi -e "s/CXXFLAGS = -O3/CXXFLAGS = %{optflags} -fPIC/" Makefile +perl -pi -e "s|LDFLAGS = |LDFLAGS = -fPIC -L/usr/X11R6/%{_lib}|" Makefile +perl -pi -e "s|LIBS = |LIBS = -lXext |" Makefile +make clean +%make +popd + +#-------- Build nx X11 libs +pushd nx-X11 +make World +popd + +#-------- build nxproxy +pushd nxproxy +%configure2_5x +%make +popd + +#-------- build nxssh +pushd nxssh +%configure2_5x +%make +popd + +%install +rm -rf %{buildroot} +#create the directory tree +install -d -m 755 %{buildroot}%{_libdir}/pkgconfig +install -d -m 755 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_includedir} +install -d -m 755 %{buildroot}%{_includedir}/nxcompsh + +#----------- nxcomp +install -m 755 nxcomp/libXcomp.so.* %{buildroot}%{_libdir} +rm -f %{buildroot}%{_libdir}/libXcomp.so.3 +ln -s libXcomp.so.3.1.0 %{buildroot}%{_libdir}/libXcomp.so.3 + +#----------- nxX11 +install -m 755 nx-X11/lib/X11/libX11-nx.so.* %{buildroot}%{_libdir} +install -m 755 nx-X11/lib/Xext/libXext-nx.so.* %{buildroot}%{_libdir} +install -m 755 nx-X11/lib/Xrender/libXrender-nx.so.* %{buildroot}%{_libdir} +install -m 755 nx-X11/programs/Xserver/nxagent %{buildroot}%{_bindir} +rm -f %{buildroot}%{_libdir}/libX11-nx.so.6 +ln -s libX11.so.6.2 %{buildroot}%{_libdir}/libX11-nx.so.6 +rm -f %{buildroot}%{_libdir}/libXext-nx.so.6 +ln -s libXext.so.6.4 %{buildroot}%{_libdir}/libXext-nx.so.6 +rm -f %{buildroot}%{_libdir}/libXrender-nx.so.1 +ln -s libXrender.so.1.2.2 %{buildroot}%{_libdir}/libXrender-nx.so.1 + +#----------- nxcompext +install -m 755 nxcompext/libXcompext.so.* %{buildroot}%{_libdir} +rm -f %{buildroot}%{_libdir}/libXcompext.so.3 +ln -s libXcompext.so.3.1.0 %{buildroot}%{_libdir}/libXcompext.so.3 +install -m 755 nxcompshad/libXcompshad.so.* %{buildroot}%{_libdir} +rm -f %{buildroot}%{_libdir}/libXcompshad.so.3 +ln -s libXcompshad.so.3.1.0 %{buildroot}%{_libdir}/libXcompshad.so.3 + +#----------- nxproxy +install -m 755 nxproxy/nxproxy %{buildroot}%{_bindir} + +#----------- nxssh +install -m 755 nxssh/nxssh %{buildroot}%{_bindir} + +%clean +rm -rf %{buildroot} + +%files -n nxproxy +%defattr(-,root,root) +%{_bindir}/nxproxy + +%files -n nxagent +%defattr(-,root,root) +%{_bindir}/nxagent + +#---------- nxcomp +%files -n %{lib_name_nxcomp} +%defattr(-,root,root) +%{_libdir}/libXcomp.so.* + +#---------- nx-x11 +%files -n %{lib_name_nxx11} +%defattr(-,root,root) +%doc GUUG-Presentation-NX.pdf +%{_libdir}/libX11-nx.so.* +%{_libdir}/libXext-nx.so.* +%{_libdir}/libXrender-nx.so.* + +#-------- lib xcompext +%files -n %{lib_name_xcompext} +%defattr(-,root,root) +%{_libdir}/libXcompext.so.* +%{_libdir}/libXcompshad.so.* + +#-------- nxssh +%files -n nxssh +%defattr(-,root,root) +%{_bindir}/nxssh + + + + +%changelog +* Fri Apr 16 2010 Funda Wang 3.3.0-3mdv2010.1 ++ Revision: 535271 +- rebuild + +* Sat Aug 22 2009 Funda Wang 3.3.0-2mdv2010.0 ++ Revision: 419581 +- fix compile with gcc 4.4 + + + Emmanuel Blindauer + - update to 3.3.0-6 + +* Thu Mar 05 2009 Guillaume Rousse 3.3.0-2mdv2009.1 ++ Revision: 348884 +- fix format errors + +* Tue Dec 09 2008 Adam Williamson 3.3.0-1mdv2009.1 ++ Revision: 312039 +- new license policy +- use rpm macros not $RPM_* +- drop unnecessary %%defines +- new release 3.3.0 + +* Fri Sep 05 2008 Adam Williamson 3.2.0-4mdv2009.0 ++ Revision: 280995 +- fix a typo +- remove now unneeded patches +- remove everything related to nxdesktop and nxviewer (these are dropped) + +* Fri Aug 08 2008 Thierry Vignaud 3.2.0-3mdv2009.0 ++ Revision: 268318 +- rebuild early 2009.0 package (before pixel changes) + + + Pixel + - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers + +* Sat Jun 07 2008 Emmanuel Blindauer 3.2.0-2mdv2009.0 ++ Revision: 216667 +- updated to latest release + +* Thu Apr 17 2008 Emmanuel Blindauer 3.2.0-1mdv2009.0 ++ Revision: 195059 +- update to 3.2.0 +- update to 3.2.0 + +* Tue Mar 25 2008 Emmanuel Blindauer 3.1.0-4mdv2008.1 ++ Revision: 189986 +- updated to latest tarballs from nomachine, fixes several CVE related to xorg + +* Mon Feb 18 2008 Thierry Vignaud 3.1.0-3mdv2008.1 ++ Revision: 171004 +- rebuild +- fix "foobar is blabla" summary (=> "blabla") so that it looks nice in rpmdrake + +* Tue Jan 29 2008 Emmanuel Blindauer 3.1.0-2mdv2008.1 ++ Revision: 159655 +- update nx-X11 to 3.1.0-3 + +* Sun Jan 27 2008 Emmanuel Blindauer 3.1.0-1mdv2008.1 ++ Revision: 158607 +- Fix compilation on x86_64 +- rediff patch +- revert nx directory and re-user X11-nx name + rediff patch0 +- fix buildrequires +- updated sources +- Updated to 3.1.0, including Xcompshad + +* Fri Dec 21 2007 Olivier Blin 2.1.0-1mdv2008.1 ++ Revision: 136633 +- restore BuildRoot + + + Thierry Vignaud + - kill re-definition of %%buildroot on Pixel's request + + +* Tue Jan 02 2007 Emmanuel Blindauer 2.1.0-1mdv2007.0 ++ Revision: 103403 +- fix x86_64 build (patch 4) +- 2.1.0 release + + + Jérôme Soyer + - Import nx + +* Sun Aug 27 2006 Couriousous 2.0.0-1mdv2007.0 +- 2.0.0 +- Rediff patches + +* Fri Dec 16 2005 Couriousous 1.5.0-4mdk +- Sync with NoMachine NX 1.5 release + +* Tue Oct 04 2005 Nicolas Lécureuil 1.5.0-3mdk +- BuildRequires fix + +* Sun Aug 21 2005 Couriousous 1.5.0-2mdk +- Sync with NoMachine NX 1.5 release + +* Sun Jul 24 2005 Couriousous 1.5.0-1mdk +- 1.5 +- Rediff some patch +- Patch to fix compilation with gcc4 + +* Fri Feb 11 2005 Couriousous 1.4.0-3mdk +- Update nx-X11 (fix security bug) +- Various others updates +- Remove patch 4 & 5, fixed upstream + +* Sun Jan 30 2005 Couriousous 1.4.0-2mdk +- Update current 1.4 release +- Some spec fix +- Sync with debian patch +- x86_64 fix + +* Fri Nov 12 2004 Couriousous 1.4.0-1mdk +- First Mandrakelinux release +- Take some fix from debian package +- Take doc from suse package +- Patch from Fabian Franz for gcc 3.4 + diff --git a/nxssh-fix-format-errors.patch b/nxssh-fix-format-errors.patch new file mode 100644 index 0000000..59dd2e7 --- /dev/null +++ b/nxssh-fix-format-errors.patch @@ -0,0 +1,51 @@ +diff -Naur --exclude '*.orig' --exclude '*~' nxssh/proxy.c nxssh-fix-format-errors/proxy.c +--- nxssh/proxy.c 2007-12-20 13:05:58.000000000 +0100 ++++ nxssh-fix-format-errors/proxy.c 2009-03-05 12:33:18.000000000 +0100 +@@ -2199,7 +2199,7 @@ + line[l] = '\\'; + line[l + 1] = '\0'; + +- debug(line); ++ debug("%s", line); + + l = 0; + } +@@ -2209,7 +2209,7 @@ + + if (line[0] != '\0') + { +- debug(line); ++ debug("%s", line); + } + + debug("---"); +@@ -2239,7 +2239,7 @@ + line[l] = '\\'; + line[l + 1] = '\0'; + +- debug(line); ++ debug("%s", line); + + l = 0; + } +@@ -2249,7 +2249,7 @@ + + if (line[0] != '\0') + { +- debug(line); ++ debug("%s", line); + } + + debug("---"); +diff -Naur --exclude '*.orig' --exclude '*~' nxssh/readpass.c nxssh-fix-format-errors/readpass.c +--- nxssh/readpass.c 2007-09-12 13:30:54.000000000 +0200 ++++ nxssh-fix-format-errors/readpass.c 2009-03-05 12:32:41.000000000 +0100 +@@ -173,7 +173,7 @@ + { + size_t len; + int retr; +- fprintf(stdout, prompt); ++ fprintf(stdout, "%s", prompt); + fflush(stdout); + + len = retr = 0;