[X2go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.9
X2go dev team
git-admin at x2go.org
Wed Feb 1 14:41:42 CET 2012
The branch, build-main has been updated
via 220c985d366883f4021cc9d84550cc630022f016 (commit)
via 8ba08fa2e1d559ae7db06f92ac5157fd033d4a38 (commit)
via 2d226a609540168640a874a9bd26f54fbf478571 (commit)
via 3467d6b762bd56ea728c64bab322263ce73e605d (commit)
via 3c0e43a41b660d50b71f917dfb767f5deca16a59 (commit)
via d4d85ca860752b8aea86f1d54e29194215f9be9d (commit)
via f17b59824868623ee51670e365b67d49def2c658 (commit)
via 36ca6646b0998d0571716a5c825dc4268a4d0481 (commit)
via 10462339662ee0d99281efb0ed7e3bf865bf20b2 (commit)
from f4379f608a752d6d64e3bd3c7d27e17a2f71344c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 11 ++
.../patches_byerace.patch | 23 ++++
.../patches_nx-X11-fix_format.patch | 126 ++++++++++++++++++++
.../009_nxproxy-add-man-page.full+lite.patch | 6 +-
.../patches/202_nx-x11_enable-xinerama.full.patch | 32 +++++-
5 files changed, 191 insertions(+), 7 deletions(-)
create mode 100644 debian/patches-pending-evaluation/patches_byerace.patch
create mode 100644 debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8ca31e4..cf1715c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nx-libs (2:3.5.0.9-0) unstable; urgency=low
+
+ [ Mike Gabriel ]
+ * Providing pending patches in source tree.
+
+ [ Oleksandr Shneyder ]
+ * Update patch: 202_nx-x11_enable-xinerama.full.patch, disable Xinerama
+ extension if NX_XINERAMA_CONF not exists.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 01 Feb 2012 14:39:57 +0100
+
nx-libs (2:3.5.0.8-0) unstable; urgency=low
* Reorganize patch names, to reflect patch inclusion into lite+full or
diff --git a/debian/patches-pending-evaluation/patches_byerace.patch b/debian/patches-pending-evaluation/patches_byerace.patch
new file mode 100644
index 0000000..1a94f4b
--- /dev/null
+++ b/debian/patches-pending-evaluation/patches_byerace.patch
@@ -0,0 +1,23 @@
+Index: nxcomp-3.2.0-7/Loop.cpp
+===================================================================
+--- nxcomp-3.2.0-7.orig/Loop.cpp 2008-09-23 19:20:51.000000000 +0200
++++ nxcomp-3.2.0-7/Loop.cpp 2008-09-23 19:20:21.000000000 +0200
+@@ -7329,6 +7329,18 @@
+ << logofs_flush;
+ #endif
+
++ // Henning Heinold
++ // fix up error from libnxcl where bye can be in front of NXPROXY
++ if (strncmp(options, "bye", strlen("bye")) == 0)
++ {
++ int bye_length = strlen("bye");
++ char *moo = &options[bye_length+1];
++
++ memmove(options, moo, DEFAULT_REMOTE_OPTIONS_LENGTH-bye_length-1);
++ *logofs << "Loop: Cleanded the bye in options, options now looks '"
++ << options << "'.\n" << logofs_flush;
++ }
++
+ if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
+ {
+ #ifdef PANIC
diff --git a/debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch b/debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch
new file mode 100644
index 0000000..2018881
--- /dev/null
+++ b/debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch
@@ -0,0 +1,126 @@
+diff --git a/nx/lib/xtrans/Xtransint.h b/nx/lib/xtrans/Xtransint.h
+index 88d2230..8d3d1cb 100644
+--- a/nx/lib/xtrans/Xtransint.h
++++ b/nx/lib/xtrans/Xtransint.h
+@@ -443,7 +443,7 @@ static int trans_mkdir (
+ int hack= 0, saveerrno=errno; \
+ struct timeval tp;\
+ gettimeofday(&tp,0); \
+- ErrorF(__xtransname); \
++ ErrorF("%s", __xtransname); \
+ ErrorF(x+hack,a,b,c); \
+ ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
+ errno=saveerrno; \
+@@ -453,7 +453,7 @@ static int trans_mkdir (
+ int hack= 0, saveerrno=errno; \
+ struct timeval tp;\
+ gettimeofday(&tp,0); \
+- fprintf(stderr, __xtransname); fflush(stderr); \
++ fprintf(stderr, "%s", __xtransname); fflush(stderr); \
+ fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
+ fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
+ fflush(stderr); \
+@@ -465,14 +465,14 @@ static int trans_mkdir (
+ /* Use ErrorF() for the X server */
+ #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
+ int hack= 0, saveerrno=errno; \
+- ErrorF(__xtransname); \
++ ErrorF("%s", __xtransname); \
+ ErrorF(x+hack,a,b,c); \
+ errno=saveerrno; \
+ } else ((void)0)
+ #else
+ #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
+ int hack= 0, saveerrno=errno; \
+- fprintf(stderr, __xtransname); fflush(stderr); \
++ fprintf(stderr, "%s", __xtransname); fflush(stderr); \
+ fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
+ errno=saveerrno; \
+ } else ((void)0)
+diff --git a/nx/lib/Xaw/DisplayList.c b/nx/lib/Xaw/DisplayList.c
+index e43621b..5b2dfe6 100644
+--- a/nx/lib/Xaw/DisplayList.c
++++ b/nx/lib/Xaw/DisplayList.c
+@@ -293,7 +293,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
+ }
+ if (fp)
+ {
+- XmuSnprintf(cname, fp - fname + 1, fname);
++ XmuSnprintf(cname, fp - fname + 1, "%s", fname);
+ memmove(fname, fp + 1, strlen(fp));
+ lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
+ if (!lc)
+diff --git a/nx/programs/Xserver/os/log.c b/nx/programs/Xserver/os/log.c
+index d3aef03..c8d0d5b 100644
+--- a/nx/programs/Xserver/os/log.c
++++ b/nx/programs/Xserver/os/log.c
+@@ -692,9 +692,9 @@ Error(char *str)
+ return;
+ sprintf(err, "%s: ", str);
+ strcat(err, strerror(saveErrno));
+- LogWrite(-1, err);
++ LogWrite(-1, "%s", err);
+ } else
+- LogWrite(-1, strerror(saveErrno));
++ LogWrite(-1, "%s", strerror(saveErrno));
+ }
+
+ void
+diff --git a/nx/programs/Xserver/GL/glx/glximports.c b/nx/programs/Xserver/GL/glx/glximports.c
+index fae2346..6e1f0db 100644
+--- a/nx/programs/Xserver/GL/glx/glximports.c
++++ b/nx/programs/Xserver/GL/glx/glximports.c
+@@ -110,12 +110,12 @@ void *__glXImpRealloc(__GLcontext *gc, void *addr, size_t newSize)
+
+ void __glXImpWarning(__GLcontext *gc, char *msg)
+ {
+- ErrorF((char *)msg);
++ ErrorF("%s", (char *)msg);
+ }
+
+ void __glXImpFatal(__GLcontext *gc, char *msg)
+ {
+- ErrorF((char *)msg);
++ ErrorF("%s", (char *)msg);
+ __glXAbort();
+ }
+
+diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
+index 64b6583..0e0f9e1 100644
+--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
+@@ -454,7 +454,7 @@ void OsVendorVErrorFFunction(const char *f, va_list args)
+
+ nxagentStartRedirectToClientsLog();
+
+- fprintf(stderr, buffer);
++ fprintf(stderr, "%s", buffer);
+
+ nxagentEndRedirectToClientsLog();
+ }
+diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
+index 963cfa2..2f778b7 100644
+--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
+@@ -232,7 +232,7 @@ static int nxagentPrintError(dpy, event, fp)
+
+ int nxagentExitHandler(const char *message)
+ {
+- FatalError(message);
++ FatalError("%s", message);
+
+ return 0;
+ }
+diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c
+index 90fb23f..b494286 100644
+--- a/nxauth/programs/nxauth/process.c
++++ b/nxauth/programs/nxauth/process.c
+@@ -974,7 +974,7 @@ fprintfhex(register FILE *fp, int len, char *cp)
+ char *hex;
+
+ hex = bintohex(len, cp);
+- fprintf(fp, hex);
++ fprintf(fp, "%s", hex);
+ free(hex);
+ }
+
diff --git a/debian/patches/009_nxproxy-add-man-page.full+lite.patch b/debian/patches/009_nxproxy-add-man-page.full+lite.patch
index f872f84..aad7674 100644
--- a/debian/patches/009_nxproxy-add-man-page.full+lite.patch
+++ b/debian/patches/009_nxproxy-add-man-page.full+lite.patch
@@ -18,13 +18,13 @@
+\fBnxproxy\fR <options>
+
+.SH DESCRIPTION
-+\fBnxproxy\fR is a tool that allows to tunnel X sessions through
++\fBnxproxy\fR is a tool that allows one to tunnel X sessions through
+the NX compression libraries. \fBnxproxy\fR is a backend application
+utilized by the X2goClient GUI and some other NX/X2go clients.
+.PP
+.SH OPTIONS
-+For an insight in \fBnxproxy\fR options use \fBnxproxy --help\fR on the command line.
++For an insight in \fBnxproxy\fR options use \fBnxproxy \-\-help\fR on the command line.
+.PP
+.SH AUTHOR
-+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
++This manual has been written by Mike Gabriel <mike.gabriel at das\-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/debian/patches/202_nx-x11_enable-xinerama.full.patch b/debian/patches/202_nx-x11_enable-xinerama.full.patch
index f097f0b..6845ec5 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.full.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
@@ -31,17 +31,41 @@ Last-Update: 2012-01-13
#define BuildDmxDevelTools NO
--- a/nx-X11/lib/Xinerama/Xinerama.c
+++ b/nx-X11/lib/Xinerama/Xinerama.c
-@@ -249,6 +249,9 @@
+@@ -34,7 +34,7 @@
+ #include <X11/extensions/panoramiXext.h>
+ #include <X11/extensions/panoramiXproto.h>
+ #include <X11/extensions/Xinerama.h>
+-
++#include <stdio.h>
+
+ static XExtensionInfo _panoramiX_ext_info_data;
+ static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
+@@ -249,6 +249,16 @@
xXineramaIsActiveReq *req;
XExtDisplayInfo *info = find_display (dpy);
+
-+ return True;
++ FILE* fptr;
++ if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
++ fclose (fptr);
++ return True;
++ }
++ else {
++ return False;
++ }
+
if(!XextHasExtension(info))
return False; /* server doesn't even have the extension */
-@@ -279,39 +282,72 @@
+@@ -266,7 +276,6 @@
+ return rep.state;
+ }
+
+-#include <stdio.h>
+
+ XineramaScreenInfo *
+ XineramaQueryScreens(
+@@ -279,39 +288,72 @@
xXineramaQueryScreensReq *req;
XineramaScreenInfo *scrnInfo = NULL;
@@ -186,7 +210,7 @@ Last-Update: 2012-01-13
else
#endif
- result = (ProcXvStopVideo(client)); break;
-+ result = (ProcXvStopVideo(client));
++ result = (ProcXvStopVideo(client));
+ break;
case xv_SetPortAttribute:
#ifdef PANORAMIX
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list