Please merge unzip 5.52-11 (main) from Debian unstable (main)

[Thierry Carrez]

Binary package hint: unzip

Please merge unzip 5.52-11 (main) from Debian unstable (main).

[Thierry Carrez (ttx)]

Debian -> Ubuntu debdiff

CVE-2008-0888 patch was included in Debian release.

Only remaining deltas are :
 * debian/rules: Configure with large file support
 * support UTF-8 file names
 * unzip.c: Change banner to indicate Ubuntu modification

[Thierry Carrez (ttx)]

old Ubuntu -> New Ubuntu debdiff

Those are exactly the same, minus the changelog entry.

[Thierry Carrez (ttx)]

Forwarding remaining patches to Debian/upstream :
* support UTF-8 file names
  * upstream is aware of the problem but has it's own solution (AppNote extension to the ZIP standard) to be included in 6.0
     See https://bugzilla.redhat.com/show_bug.cgi?id=225576#c25
  * Debian has bug 339021 about the problem
* Configure with large file support
  * Was apparently lost in Debian at some point, filed Debian bug 486100 to suggest them to reenable it.

[Thierry Carrez (ttx)]

Hold on --
In fact large file support was added in Debian version a long time ago and the subsequent Ubuntu merges missed it.

Debian uses :
 CFLAGS = -g -Wall $$(getconf LFS_CFLAGS)
 DEFINES = -DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR

While we use :
 CFLAGS = -g -Wall $$(getconf LFS_CFLAGS)
 DEFINES = -DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

which is probably redundant (the getconf LFS_CFLAGS should define -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64).

I'll clean up the merge.

[Thierry Carrez (ttx)]

Debian -> Ubuntu debdiff

CVE-2008-0888 patch was included in Debian release.
Configure for large file support was included in debian (since 5.52-9) using a slightly different way (getconf LFS_CFLAGS instead of the defines). I tested builds with a >2gb zip file and it unzipped alright.

Only remaining deltas are :
 * support UTF-8 file names
 * unzip.c: Change banner to indicate Ubuntu modification

[Thierry Carrez (ttx)]

old Ubuntu -> New Ubuntu debdiff

I had to reverse our large file support patch, otherwise it's clean.

[Daniel Holbach (dholbach)]

Evan: can you please take a look at it?

[Bryce Harrington (bryce)]

Oh sorry, I did this one already earlier.