diff -Nru varnish-2.1.3/debian/changelog varnish-2.1.3/debian/changelog --- varnish-2.1.3/debian/changelog 2010-09-09 20:04:20.000000000 +0100 +++ varnish-2.1.3/debian/changelog 2011-01-29 09:27:49.000000000 +0000 @@ -1,3 +1,10 @@ +varnish (2.1.3-7ubuntu0.1) maverick-proposed; urgency=low + + * debian/patches/varnishtop-arrayalloc-fix.diff: + - Fix array size allocation. Fixed upstream in version 2.1.4 (LP: #708939) + + -- SevenMachines Sat, 29 Jan 2011 09:27:10 +0000 + varnish (2.1.3-7) unstable; urgency=high [ Faidon Liambotis ] diff -Nru varnish-2.1.3/debian/control varnish-2.1.3/debian/control --- varnish-2.1.3/debian/control 2010-08-27 23:38:41.000000000 +0100 +++ varnish-2.1.3/debian/control 2011-01-29 09:28:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: varnish Section: web Priority: optional -Maintainer: Varnish Package Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Varnish Package Maintainers Uploaders: Stig Sandbeck Mathisen , Lars Bahner , Fabio Tranchitella diff -Nru varnish-2.1.3/debian/patches/series varnish-2.1.3/debian/patches/series --- varnish-2.1.3/debian/patches/series 2010-09-09 20:11:15.000000000 +0100 +++ varnish-2.1.3/debian/patches/series 2011-01-29 09:28:42.000000000 +0000 @@ -1 +1,2 @@ debian-changes-2.1.3-7 +varnishtop-arrayalloc-fix.diff diff -Nru varnish-2.1.3/debian/patches/varnishtop-arrayalloc-fix.diff varnish-2.1.3/debian/patches/varnishtop-arrayalloc-fix.diff --- varnish-2.1.3/debian/patches/varnishtop-arrayalloc-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ varnish-2.1.3/debian/patches/varnishtop-arrayalloc-fix.diff 2011-01-29 09:28:42.000000000 +0000 @@ -0,0 +1,15 @@ +From: SevenMachines +Description: Fix array size allocation +Bug-Ubuntu: https://bugs.launchpad.net/bugs/708939 +Origin: http://www.varnish-cache.org/trac/changeset/8db4492b16aafc2a5fac28b4966ee7465e6598f5 +--- varnish-2.1.3/bin/varnishtop/varnishtop.c 2010-07-28 14:35:09.000000000 +0100 ++++ ../varnish-exp/varnish-2.1.4/bin/varnishtop/varnishtop.c 2010-10-30 08:08:54.000000000 +0100 +@@ -55,7 +55,7 @@ + #include "varnishapi.h" + + struct top { +- unsigned char rec[4]; ++ unsigned char rec[SHMLOG_DATA-1]; + unsigned char *rec_data; + unsigned clen; + unsigned hash;