diff -u zabbix-1.1/debian/patches/00list zabbix-1.1/debian/patches/00list
--- zabbix-1.1/debian/patches/00list
+++ zabbix-1.1/debian/patches/00list
@@ -3,0 +4 @@
+04_CVE-2007-0640
diff -u zabbix-1.1/debian/changelog zabbix-1.1/debian/changelog
--- zabbix-1.1/debian/changelog
+++ zabbix-1.1/debian/changelog
@@ -1,3 +1,14 @@
+zabbix (1:1.1-6ubuntu0.1) edgy-security; urgency=low
+
+  * SECURITY UPDATE: Buffer overflow in SNMP IP address handling.
+  * debian/patches/CVE-2007-0640.dpatch: Add to fix buffer overflow.
+  * References:
+    - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=409257
+    - http://www.zabbix.com/rn1.1.5.php
+    - CVE-2007-0640
+
+ -- William Grant <william.grant@ubuntu.org.au>  Sat, 10 Mar 2007 12:35:52 +1100
+
 zabbix (1:1.1-6) unstable; urgency=low
 
   * all:
only in patch2:
unchanged:
--- zabbix-1.1.orig/debian/patches/04_CVE-2007-0640.dpatch
+++ zabbix-1.1/debian/patches/04_CVE-2007-0640.dpatch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## DP: Fix for buffer overflow in SNMP IP address handling
+##     CVE-2007-0640
+
+@DPATCH@
+diff -urNad zabbix-1.1~/src/zabbix_server/poller/checks_snmp.c zabbix-1.1/src/zabbix_server/poller/checks_snmp.c
+--- zabbix-1.1~/src/zabbix_server/poller/checks_snmp.c	2007-03-10 12:29:40.000000000 +1100
++++ zabbix-1.1/src/zabbix_server/poller/checks_snmp.c	2007-03-10 12:31:17.000000000 +1100
+@@ -364,7 +364,7 @@
+ 				}
+ 				else
+ 				{
+-					p = malloc(16);
++					p = malloc(MAX_STRING_LEN);
+ 					if(p)
+ 					{
+ 						snprintf(p,MAX_STRING_LEN-1,"%d.%d.%d.%d",ip[0],ip[1],ip[2],ip[3]);