[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-2-g2ef4ab4

[X2Go dev team]

The branch, master has been updated
       via  2ef4ab414e6d872b4acfb369193a6cd2fe4e6957 (commit)
      from  b29654d5421008e8aab89902ea2ee528990681c8 (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 -----------------------------------------------------------------
commit 2ef4ab414e6d872b4acfb369193a6cd2fe4e6957
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 30 21:00:41 2013 +0200

    Add patch: 603_nx-X11_compilation_warnings.full.patch. Fix 3 evident bugs: one implicit function declaration issue and two array index out of bounds issues. (Fixes: #314).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    5 ++-
 .../603_nx-X11_compilation_warnings.full.patch     |   38 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/603_nx-X11_compilation_warnings.full.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1f0ed61..5bc7c8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 nx-libs (2:3.5.0.22-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  [ Mirraz Mirraz ]
+  * Add patch: 603_nx-X11_compilation_warnings.full.patch. Fix 3 evident bugs:
+    one implicit function declaration issue and two array index out of bounds
+    issues. (Fixes: #314).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 30 Aug 2013 16:20:18 +0200
 
diff --git a/debian/patches/603_nx-X11_compilation_warnings.full.patch b/debian/patches/603_nx-X11_compilation_warnings.full.patch
new file mode 100644
index 0000000..3656461
--- /dev/null
+++ b/debian/patches/603_nx-X11_compilation_warnings.full.patch
@@ -0,0 +1,38 @@
+Description: Handle some serious compilation warnings
+Author: Mirraz Mirraz <mirraz1 at rambler.ru>
+--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c	2013-08-30 20:18:40.000000000 +0600
++++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c	2013-09-30 18:39:42.357560169 +0600
+@@ -3259,7 +3259,6 @@
+    vp->SrcReg[0].Swizzle = SWIZZLE_NOOP;
+    vp->SrcReg[1].Swizzle = SWIZZLE_NOOP;
+    vp->SrcReg[2].Swizzle = SWIZZLE_NOOP;
+-   vp->SrcReg[3].Swizzle = SWIZZLE_NOOP;
+    vp->DstReg.WriteMask = 0xf;
+ 
+    switch (type) {
+--- a/nx-X11/lib/X11/imLcPrs.c	2013-08-30 20:18:40.000000000 +0600
++++ b/nx-X11/lib/X11/imLcPrs.c	2013-09-30 19:02:56.925125678 +0600
+@@ -589,7 +589,7 @@
+ 
+     l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
+     if (l == LOCAL_UTF8_BUFSIZE - 1) {
+-	local_wc_buf[l] = '\0';
++	local_utf8_buf[l] = '\0';
+     }
+     if( (rhs_string_utf8 = (char *)Xmalloc(l + 1)) == NULL ) {
+ 	Xfree( rhs_string_wc );
+--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c	2013-08-30 20:18:40.000000000 +0600
++++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c	2013-09-30 18:56:27.358995920 +0600
+@@ -37,6 +37,12 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <ctype.h>
++
++/* stat() */
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
+ #define	NEED_EVENTS 1
+ #include <X11/X.h>
+ #include <X11/Xos.h>
diff --git a/debian/patches/series b/debian/patches/series
index 8c5eebd..3526c84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,6 +48,7 @@
 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
 602_nx-X11_initgroups.full.patch
+603_nx-X11_compilation_warnings.full.patch
 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
 016_nx-X11_install-location.debian.patch
 102_xserver-xext_set-securitypolicy-path.debian.patch


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)).