diffstat for linux86_0.16.17-3.1 linux86_0.16.17-3.1ubuntu3

 bcc/bcc.c                        |    9 +++---
 linux86-0.16.17/debian/changelog |   57 ++++++++++++++++++++++++++++++++++++++-
 linux86-0.16.17/debian/control   |    3 +-
 linux86-0.16.17/debian/rules     |    2 -
 4 files changed, 64 insertions(+), 7 deletions(-)

diff -u linux86-0.16.17/debian/control linux86-0.16.17/debian/control
--- linux86-0.16.17/debian/control
+++ linux86-0.16.17/debian/control
@@ -1,7 +1,8 @@
 Source: linux86
 Section: devel
 Priority: optional
-Maintainer: Juan Cespedes <cespedes@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Juan Cespedes <cespedes@debian.org>
 Standards-Version: 3.8.0
 
 Package: bin86
diff -u linux86-0.16.17/debian/changelog linux86-0.16.17/debian/changelog
--- linux86-0.16.17/debian/changelog
+++ linux86-0.16.17/debian/changelog
@@ -1,3 +1,26 @@
+linux86 (0.16.17-3.1ubuntu3) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 05 Oct 2012 11:33:40 +0100
+
+linux86 (0.16.17-3.1ubuntu2) natty; urgency=low
+
+  * debian/rules: 
+      - Replace i486-linux-gnu search with i686-linux-gnu so that elksemu will
+      be installed. (LP: #706635)
+
+ -- SevenMachines <SevenMachines@yahoo.co.uk>  Fri, 28 Jan 2011 08:22:31 +0000
+
+linux86 (0.16.17-3.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #704233)
+    - bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify
+      failures and FTBFS. (Closes: #523807)
+  * debian/rules: Drop build lpia, this change is obsolete and doesn't work.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Tue, 18 Jan 2011 01:35:52 +0100
+
 linux86 (0.16.17-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -6,6 +29,19 @@
 
  -- gregor herrmann <gregoa@debian.org>  Thu, 11 Nov 2010 22:29:38 +0100
 
+linux86 (0.16.17-3ubuntu2) jaunty; urgency=low
+
+  * bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify
+    failures and FTBFS (LP: #360096, debian bug 523807).
+
+ -- Kees Cook <kees@ubuntu.com>  Sun, 12 Apr 2009 09:47:16 -0700
+
+linux86 (0.16.17-3ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 17 Nov 2008 11:57:41 +0100
+
 linux86 (0.16.17-3) unstable; urgency=low
 
   * Added man pages for ar86, objdump86, size86 and nm86 with patch
@@ -43,6 +79,13 @@
 
  -- Moritz Muehlenhoff <jmm@debian.org>  Tue,  5 Aug 2008 00:18:32 +0200
 
+linux86 (0.16.17-2ubuntu1) hardy; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build elks-libc for lpia.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 07 Dec 2007 20:33:39 +0000
+
 linux86 (0.16.17-2) unstable; urgency=low
 
   * Disable elksemu building in non-i386 architectures
@@ -57,6 +100,19 @@
 
  -- Juan Cespedes <cespedes@debian.org>  Sun, 26 Aug 2007 13:42:07 +0200
 
+linux86 (0.16.14-1.4ubuntu1) gutsy; urgency=low
+
+  * Build elks-libc for lpia.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 10 Aug 2007 19:25:27 +0000
+
+linux86 (0.16.14-1.4build1) feisty; urgency=low
+
+  * Rebuild for ldbl128 change (powerpc, sparc).
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun,  4 Mar 2007 01:08:58 +0000
+
 linux86 (0.16.14-1.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -327 +382,0 @@
-
diff -u linux86-0.16.17/debian/rules linux86-0.16.17/debian/rules
--- linux86-0.16.17/debian/rules
+++ linux86-0.16.17/debian/rules
@@ -63,7 +63,7 @@
 # ``bcc'' specific things:
 		install -d debian/tmp-bcc/usr/bin
 		mv debian/tmp/usr/bin/bcc debian/tmp-bcc/usr/bin
-ifeq ($(findstring i486-linux-gnu,$(DEB_BUILD_GNU_TYPE)),i486-linux-gnu)
+ifeq ($(findstring i686-linux-gnu,$(DEB_BUILD_GNU_TYPE)),i686-linux-gnu)
 		mv debian/tmp/usr/bin/elksemu debian/tmp-bcc/usr/bin
 		install -d debian/tmp-bcc/usr/share/man/man1
 		mv debian/tmp/usr/man/man1/elksemu.1.gz debian/tmp-bcc/usr/share/man/man1
only in patch2:
unchanged:
--- linux86-0.16.17.orig/bcc/bcc.c
+++ linux86-0.16.17/bcc/bcc.c
@@ -32,6 +32,7 @@
 #ifndef MSDOS
 #include <sys/wait.h>
 #include <signal.h>
+#include <limits.h>
 #endif
 #include "version.h"
 
@@ -600,8 +601,12 @@
 command_reset()
 {
 #ifndef MAXPATHLEN
+#ifdef PATH_MAX
+#define MAXPATHLEN PATH_MAX
+#else
 #define MAXPATHLEN 1024
 #endif
+#endif
    char buf[MAXPATHLEN];
    char ** prefix;
    char * saved_cmd;
@@ -1308,11 +1313,7 @@
 
       for(d=s=ptr; d && *s; s=d)
       {
-#ifdef MAXPATHLEN
          char buf[MAXPATHLEN];
-#else
-         char buf[1024];
-#endif
 
 	 free(temp);
          d=strchr(s, ':');