diff -u sqlite-2.8.17/debian/changelog sqlite-2.8.17/debian/changelog
--- sqlite-2.8.17/debian/changelog
+++ sqlite-2.8.17/debian/changelog
@@ -1,8 +1,16 @@
-sqlite (2.8.17-2build1) gutsy; urgency=low
+sqlite (2.8.17-2.1build1) gutsy; urgency=low
 
-  * Fakesync with Debian because of different tarballs.
+  * Fake-sync because of a different orig.tar.gz.
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 24 May 2007 12:54:41 +0200
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 08 Sep 2007 03:24:29 +0200
+
+sqlite (2.8.17-2.1) unstable; urgency=high
+
+  * Non-maintainer upload by testing security team.
+  * Included 01-fix-CVE-2007-1888.patch to fix buffer overflow
+    in encode.c (CVE-2007-1888) (Closes: #441233).
+
+ -- Nico Golde <nion@debian.org>  Fri, 07 Sep 2007 17:47:03 +0200
 
 sqlite (2.8.17-2) unstable; urgency=low
 
@@ -12,18 +20,6 @@
 
  -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Tue, 30 Jan 2007 18:03:13 +0000
 
-sqlite (2.8.17-1build2) feisty; urgency=low
-
-  * Rebuild for changes in the amd64 toolchain.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:26:27 +0000
-
-sqlite (2.8.17-1build1) feisty; urgency=low
-
-  * Fakesync with Debian because of different tarballs
-
- -- Sebastian Dröge <slomo@ubuntu.com>  Thu, 16 Nov 2006 18:58:32 +0100
-
 sqlite (2.8.17-1) unstable; urgency=low
 
   * New upstream release (closes: #357168) and new maintainer with ACK from
only in patch2:
unchanged:
--- sqlite-2.8.17.orig/debian/patches/01-fix-CVE-2007-1888.patch
+++ sqlite-2.8.17/debian/patches/01-fix-CVE-2007-1888.patch
@@ -0,0 +1,14 @@
+diff -Nurad sqlite-2.8.17~/src/encode.c sqlite-2.8.17/src/encode.c
+--- sqlite-2.8.17~/src/encode.c	2007-09-07 17:45:19.000000000 +0200
++++ sqlite-2.8.17/src/encode.c	2007-09-07 17:45:50.000000000 +0200
+@@ -176,6 +176,10 @@
+   int i, e;
+   unsigned char c;
+   e = *(in++);
++  if(e == 0){
++    return 0;
++  }
++
+   i = 0;
+   while( (c = *(in++))!=0 ){
+     if( c==1 ){