diff -u ciso-1.0.0/debian/rules ciso-1.0.0/debian/rules --- ciso-1.0.0/debian/rules +++ ciso-1.0.0/debian/rules @@ -20,8 +20,10 @@ CFLAGS += -O2 endif +include /usr/share/dpatch/dpatch.make + configure: configure-stamp -configure-stamp: +configure-stamp: patch dh_testdir # Add here commands to configure the package. @@ -39,7 +41,9 @@ touch $@ -clean: +clean: clean-patched unpatch + +clean-patched: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -86 +90 @@ -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean clean-patched binary-indep binary-arch binary install configure diff -u ciso-1.0.0/debian/control ciso-1.0.0/debian/control --- ciso-1.0.0/debian/control +++ ciso-1.0.0/debian/control @@ -1,8 +1,9 @@ Source: ciso Section: utils Priority: optional -Maintainer: Gaëtan Petit -Build-Depends: debhelper (>= 5), zlib1g-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Gaëtan Petit +Build-Depends: debhelper (>= 5), zlib1g-dev, dpatch Standards-Version: 3.7.2 Package: ciso @@ -16 +17 @@ - Homepage : http://ciso.tenshu.fr/ + Homepage: http://ciso.tenshu.fr/ diff -u ciso-1.0.0/debian/changelog ciso-1.0.0/debian/changelog --- ciso-1.0.0/debian/changelog +++ ciso-1.0.0/debian/changelog @@ -1,3 +1,10 @@ +ciso (1.0.0-0ubuntu2) jaunty; urgency=low + + * Resolution of memory allocation failure on amd64 which caused unusable + ciso files to be created (LP: #163308) + + -- Brian Murray Tue, 02 Dec 2008 20:58:34 -0800 + ciso (1.0.0-0ubuntu1) feisty; urgency=low * Initial release only in patch2: unchanged: --- ciso-1.0.0.orig/debian/patches/01_mem_alloc_failure_amd64.dpatch +++ ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_mem_alloc_failure_amd64.dpatch by Brian Murray +## +## Ubuntu: http://launchpad.net/bugs/163308 +## Description: Use standard integer types to avoid accidental 8 byte value +## when 4 was intended (32bit vs 64bit long) + +@DPATCH@ +diff -urNad ciso-1.0.0-20081201~/ciso.c ciso-1.0.0-20081201/ciso.c +--- ciso-1.0.0-20081201~/ciso.c 2008-12-01 16:16:21.000000000 -0800 ++++ ciso-1.0.0-20081201/ciso.c 2008-12-01 16:53:07.000000000 -0800 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include /* /usr(/local)/include/zlib.h */ + #include + +diff -urNad ciso-1.0.0-20081201~/ciso.h ciso-1.0.0-20081201/ciso.h +--- ciso-1.0.0-20081201~/ciso.h 2008-12-01 16:16:21.000000000 -0800 ++++ ciso-1.0.0-20081201/ciso.h 2008-12-01 16:52:35.000000000 -0800 +@@ -28,9 +28,9 @@ + typedef struct ciso_header + { + unsigned char magic[4]; /* +00 : 'C','I','S','O' */ +- unsigned long header_size; /* +04 : header size (==0x18) */ ++ uint32_t header_size; /* +04 : header size (==0x18) */ + unsigned long long total_bytes; /* +08 : number of original data size */ +- unsigned long block_size; /* +10 : number of compressed block size */ ++ uint32_t block_size; /* +10 : number of compressed block size */ + unsigned char ver; /* +14 : version 01 */ + unsigned char align; /* +15 : align of index value */ + unsigned char rsv_06[2]; /* +16 : reserved */ only in patch2: unchanged: --- ciso-1.0.0.orig/debian/patches/00list +++ ciso-1.0.0/debian/patches/00list @@ -0,0 +1 @@ +01_mem_alloc_failure_amd64.dpatch