4 files changed, 38 insertions, 4 deletions
diff --git a/development/xa/dxa-malloc-patch.txt.1 b/development/xa/dxa-malloc-patch.txt.1
new file mode 100644
index 000000000000..895ac7b454bf
--- /dev/null
+++ b/development/xa/dxa-malloc-patch.txt.1
@@ -0,0 +1,21 @@
+--- label.c.orig	2006-11-01 18:23:28.000000000 +0200
++++ label.c	2010-08-31 21:45:43.000000000 +0300
+@@ -40,7 +40,7 @@
+ #include "opcodes.h"
+ 
+ label *labeltable;
+-char defaultlabel[5];
++char defaultlabel[6];
+ unsigned numLabels = 0;
+ 
+ #ifndef __STDC__
+@@ -55,7 +55,7 @@
+   label *entry;
+   char *buffer;
+ 
+-  if (!((buffer = malloc (strlen (name)))))
++  if (!((buffer = malloc (strlen (name) + 1))))
+     return;
+ 
+   entry = numLabels ?
+
diff --git a/development/xa/dxa-valgrind-patch.txt.1 b/development/xa/dxa-valgrind-patch.txt.1
new file mode 100644
index 000000000000..92a5658f69d3
--- /dev/null
+++ b/development/xa/dxa-valgrind-patch.txt.1
@@ -0,0 +1,12 @@
+diff --git a/tools/dxa-0.1.3/scan.c b/tools/dxa-0.1.3/scan.c
+index e7855f8..586d31b 100644
+--- a/tools/dxa-0.1.3/scan.c
++++ b/tools/dxa-0.1.3/scan.c
+@@ -597,6 +597,7 @@ int ScanSpecified (void)
+                        (unsigned int)entry->address);
+                return 1;
+        }
++    entry = FindNextEntryType (NULL, ~0, RTN_SURE);
+     DeleteEntry (entry);
+   }
+
diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index 882e5b6e57fe..0488b904514e 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -6,8 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# Note to self: remove dxa patches before submitting: rm xa-*gz dxa-*
 PRGNAM=xa
-VERSION=${VERSION:-2.3.5}
+VERSION=${VERSION:-2.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/xa/xa.info b/development/xa/xa.info
index c0f36acb269d..07b10d9a44de 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,12 +1,12 @@
 PRGNAM="xa"
-VERSION="2.3.5"
+VERSION="2.3.6"
 HOMEPAGE="http://www.floodgap.com/retrotech/xa/"
-DOWNLOAD="http://www.floodgap.com/retrotech/xa/dists/xa-2.3.5.tar.gz \
+DOWNLOAD="http://www.floodgap.com/retrotech/xa/dists/xa-2.3.6.tar.gz \
           http://www.floodgap.com/retrotech/xa/dists/dxa-0.1.3.tar.gz \
           http://www.floodgap.com/retrotech/xa/dxa-malloc-patch.txt \
           http://www.floodgap.com/retrotech/xa/dxa-valgrind-patch.txt"
 DOWNLOAD_x86_64=""
-MD5SUM="edd15aa8674fb86225faf34e56d5cab2 \
+MD5SUM="6e7ee302fc4cd8de3bf7f07abb336aca \
         4fb88a7eda5939472b3a1d1c48b057fc \
         95988ec879a3b6fd757c830fba7831f4 \
         689c05e1b8f2e5c84e0e229f2cdc61c9"