diff --git a/app-arch/unzip/patches/unzip-6.0.patchset b/app-arch/unzip/patches/unzip-6.0.patchset index 543fbd22d..4b6a17a63 100644 --- a/app-arch/unzip/patches/unzip-6.0.patchset +++ b/app-arch/unzip/patches/unzip-6.0.patchset @@ -1,4 +1,4 @@ -From 9e1fdc058f3f8d1c89b70bdea27d88e7d5b40f41 Mon Sep 17 00:00:00 2001 +From b8754a12212c2e37053e7a74a27a7d7f1f79913c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 25 Feb 2015 18:16:33 +0000 Subject: Haiku patch @@ -84,7 +84,7 @@ index dc9eff5..2cb9af6 100644 1.8.3.4 -From 663774c200aef88dbd0b9fd6224031a398639191 Mon Sep 17 00:00:00 2001 +From 6f4d07e984224be0b5edf1b7dd18d7a603ceec70 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 25 Feb 2015 21:47:12 +0000 Subject: merge beos.c into unix.c with __HAIKU__ @@ -562,7 +562,7 @@ index 5b2a326..a002d95 100644 1.8.3.4 -From 88c4b77d72c2174d41dc4ee91884c889e063a897 Mon Sep 17 00:00:00 2001 +From ecc3dc54154357bb5a484deda277eac429e1b186 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 25 Feb 2015 22:24:29 +0000 Subject: apply patch from Ingo Weinhold @@ -655,3 +655,37 @@ index df76ffc..ff7605a 100644 -- 1.8.3.4 + +From f6d3d7ea8574aeb43884158ea4c6fd51a9b68880 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 5 May 2015 21:04:17 +0000 +Subject: Haiku: attribsize should be a minimum of 4 + + +diff --git a/unix/unix.c b/unix/unix.c +index ff7605a..d3098e8 100644 +--- a/unix/unix.c ++++ b/unix/unix.c +@@ -1204,7 +1204,7 @@ void close_outfile(__G) /* GRR: change to return PK-style warning level */ + slnk_entry->attriblen = attribsize; + # ifdef SET_SYMLINK_ATTRIBS + #ifdef __HAIKU__ +- if (attribsize > 0) ++ if (attribsize > sizeof(unsigned)) + memcpy(slnk_entry->buf, BeOS_exfld, attribsize); + #else + memcpy(slnk_entry->buf, &(G.pInfo->file_attr), +@@ -1347,7 +1347,9 @@ int set_symlnk_attribs(__G__ slnk_entry) + { + if (slnk_entry->attriblen > 0) { + #ifdef __HAIKU__ +- setBeOSexfield(slnk_entry->fname, (uch *)slnk_entry->buf); ++ if (slnk_entry->attriblen > sizeof(unsigned)) { ++ setBeOSexfield(slnk_entry->fname, (uch *)slnk_entry->buf); ++ } + #endif + # if (!defined(NO_LCHOWN)) + if (slnk_entry->attriblen > sizeof(unsigned)) { +-- +1.8.3.4 + diff --git a/app-arch/unzip/unzip-6.0.recipe b/app-arch/unzip/unzip-6.0.recipe index a85b8683b..ecd4c330f 100644 --- a/app-arch/unzip/unzip-6.0.recipe +++ b/app-arch/unzip/unzip-6.0.recipe @@ -9,7 +9,7 @@ LICENSE="Info-ZIP" COPYRIGHT="1995-2014 Greg Roelofs" SRC_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz" CHECKSUM_SHA256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="unzip-$portVersion.patchset"