diff -u mawk-1.3.3/debian/changelog mawk-1.3.3/debian/changelog
--- mawk-1.3.3/debian/changelog
+++ mawk-1.3.3/debian/changelog
@@ -1,3 +1,12 @@
+mawk (1.3.3-15ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #405721
+    - Do not crash if regexp is too long for our buffer.
+      LP: #23494, Debian Bug: #391051.
+    - autopkgtest/autodebtest now supported - upstream tests wired in.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Tue, 28 Jul 2009 15:46:22 +0530
+
 mawk (1.3.3-15) unstable; urgency=high
 
   * Fix debian/copyright to correctly list the license as GPLv2, not GPLv2
@@ -5,6 +14,15 @@
 
  -- Steve Langasek <vorlon@debian.org>  Mon, 27 Jul 2009 11:26:47 -0700
 
+mawk (1.3.3-14ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Do not crash if regexp is too long for our buffer.
+      LP: #23494, Debian Bug: #391051.
+    - autopkgtest/autodebtest now supported - upstream tests wired in.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Apr 2009 21:33:12 +0200
+
 mawk (1.3.3-14) unstable; urgency=low
 
   * Build-Conflict with byacc, as the current version doesn't appear to be
@@ -14,6 +32,15 @@
 
  -- Steve Langasek <vorlon@debian.org>  Fri, 26 Dec 2008 16:17:53 -0800
 
+mawk (1.3.3-13ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Do not crash if regexp is too long for our buffer.
+      LP: #23494, Debian Bug: #391051.
+    - autopkgtest/autodebtest now supported - upstream tests wired in.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 05 Nov 2008 06:42:01 +0000
+
 mawk (1.3.3-13) unstable; urgency=low
 
   * New maintainer; closes: #496711.
@@ -37,6 +64,14 @@
 
  -- Anibal Monsalve Salazar <anibal@debian.org>  Wed, 27 Aug 2008 17:41:50 +1000
 
+mawk (1.3.3-11.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Do not crash if regexp is too long for our buffer.  (LP #23494)
+    - autopkgtest/autodebtest now supported - upstream tests wired in.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 06 May 2008 11:49:05 +0200
+
 mawk (1.3.3-11.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -44,6 +79,18 @@
 
  -- Peter Eisentraut <petere@debian.org>  Sat, 05 Apr 2008 17:11:11 +0200
 
+mawk (1.3.3-11ubuntu2) edgy; urgency=low
+
+  * Do not crash if regexp is too long for our buffer.  (LP 23494.)
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed,  4 Oct 2006 16:07:11 +0100
+
+mawk (1.3.3-11ubuntu1) dapper; urgency=low
+
+  * autopkgtest/autodebtest now supported - upstream tests wired in.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  7 Feb 2006 17:45:13 +0000
+
 mawk (1.3.3-11) unstable; urgency=low
 
   * 08_fix-for-gcc3.3.dpatch: grossly hack configure to work around
@@ -267,0 +315 @@
+
diff -u mawk-1.3.3/debian/control mawk-1.3.3/debian/control
--- mawk-1.3.3/debian/control
+++ mawk-1.3.3/debian/control
@@ -1,7 +1,8 @@
 Source: mawk
 Section: utils
 Priority: required
-Maintainer: Steve Langasek <vorlon@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Steve Langasek <vorlon@debian.org>
 Build-Depends: dpatch, bison
 Build-Conflicts: byacc
 Standards-Version: 3.8.2
only in patch2:
unchanged:
--- mawk-1.3.3.orig/scan.c
+++ mawk-1.3.3/scan.c
@@ -1033,6 +1033,15 @@
    STRING *sval ;
 
    while (1)
+   {
+      if (p == string_buff + SPRINTF_SZ - 2)
+      {
+          compile_error(
+			  "regular expression /%.10s ..."
+			  " exceeds implementation size limit",
+			  string_buff) ;
+	  mawk_exit(2) ;
+      }
       switch (scan_code[*p++ = next()])
       {
 	 case SC_DIV:		/* done */
@@ -1070,6 +1079,7 @@
 	    }
 	    break ;
       }
+   }
 
 out:
    /* now we've got the RE, so compile it */
only in patch2:
unchanged:
--- mawk-1.3.3.orig/debian/tests/mawktest
+++ mawk-1.3.3/debian/tests/mawktest
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+sed -e '
+	/^PATH=/d;
+	/^mawk -W version/ s/$/ 2>&1/;
+' <test/mawktest >"$TMPDIR/mawktest"
+chmod +x "$TMPDIR/mawktest"
+cd test
+"$TMPDIR/mawktest"
only in patch2:
unchanged:
--- mawk-1.3.3.orig/debian/tests/control
+++ mawk-1.3.3/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: mawktest
+Restrictions: rw-build-tree
only in patch2:
unchanged:
--- mawk-1.3.3.orig/test/1
+++ mawk-1.3.3/test/1
@@ -0,0 +1,3 @@
+compiled limits:
+max NF             32767
+sprintf buffer      1020