libzip: 0.11.2 -> 1.1.2
This commit is contained in:
parent
387915e99c
commit
2c32607650
@ -1,26 +1,23 @@
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
{ stdenv, fetchurl, perl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libzip-0.11.2";
|
||||
name = "libzip-${version}";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nih.at/libzip/${name}.tar.gz";
|
||||
sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3";
|
||||
sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
# fix CVE-2015-2331 taken from Debian patch:
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756
|
||||
postPatch = ''
|
||||
substituteInPlace lib/zip_dirent.c --replace \
|
||||
'else if ((cd->entry=(struct zip_entry *)' \
|
||||
'else if (nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_entry *)'
|
||||
cat lib/zip_dirent.c
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
||||
preInstall = ''
|
||||
patchShebangs man/handle_links
|
||||
'';
|
||||
|
||||
# At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
|
||||
# had this same problem. This links it somewhere that mysqlworkbench looks.
|
||||
postInstall = ''
|
||||
|
Loading…
Reference in New Issue
Block a user