diff --git a/sys-fs/dmg2img/dmg2img-1.6.5.recipe b/sys-fs/dmg2img/dmg2img-1.6.6.recipe similarity index 66% rename from sys-fs/dmg2img/dmg2img-1.6.5.recipe rename to sys-fs/dmg2img/dmg2img-1.6.6.recipe index d2c8f4abc..0e4188731 100644 --- a/sys-fs/dmg2img/dmg2img-1.6.5.recipe +++ b/sys-fs/dmg2img/dmg2img-1.6.6.recipe @@ -1,18 +1,19 @@ SUMMARY="Converts Apple DMG files to standard HFS+ images" -DESCRIPTION="dmg2img is an command-line tool for converting .dmg files, \ +DESCRIPTION="dmg2img is a command line tool for converting .dmg files, \ popular on Mac OS X systems, to HFS+ disk images. A companion command-line tool, vfdecrypt, allows to decrypt encrypted Mac OS X \ disk image files (also known as filevault disk)." HOMEPAGE="http://vu1tur.eu.org/tools/" -COPYRIGHT="2007-2008 Jean-Pierre Demailly (dmg2img) +COPYRIGHT="2007-2009 Jean-Pierre Demailly (dmg2img) + 2017 Peter Wu (dmg2img) 2009-2013 vu1tur (dmg2img) 2006 Ralf-Philipp Weinmann, Jacob Appelbaum, Christian Fromme \ (vfdecrypt)" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://vu1tur.eu.org/tools/dmg2img-$portVersion.tar.gz" -CHECKSUM_SHA256="400a16cbe5cb2bf8a9eec4a43ef3546e0329f248bbd2a79f6d9a1ebc0b503308" -PATCHES="dmg2img-$portVersion.patch" +CHECKSUM_SHA256="9ba6384a7fb8cc852efa87df5e2b4e1d493dc5bff1a77daf2435fa00301adc85" +PATCHES="dmg2img-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -47,10 +48,8 @@ BUILD() INSTALL() { - mkdir -p $binDir - cp dmg2img vfdecrypt $binDir - mkdir -p $manDir/man1 - cp vfdecrypt.1 $manDir/man1 - mkdir -p $docDir - cp README $docDir + install -d $binDir $docDir $manDir/man1 + install -t $binDir -s dmg2img vfdecrypt + install -t $docDir -m a=r README + install -t $manDir/man1 -m a=r vfdecrypt.1 } diff --git a/sys-fs/dmg2img/patches/dmg2img-1.6.5.patch b/sys-fs/dmg2img/patches/dmg2img-1.6.6.patchset similarity index 82% rename from sys-fs/dmg2img/patches/dmg2img-1.6.5.patch rename to sys-fs/dmg2img/patches/dmg2img-1.6.6.patchset index 8d246b1f2..79edf948a 100644 --- a/sys-fs/dmg2img/patches/dmg2img-1.6.5.patch +++ b/sys-fs/dmg2img/patches/dmg2img-1.6.6.patchset @@ -1,6 +1,13 @@ -diff -upr dmg2img-1.6.5/adc.c dmg2img-1.6.5-haiku/adc.c ---- dmg2img-1.6.5/adc.c 2010-03-24 17:52:45.000000000 +0000 -+++ dmg2img-1.6.5-haiku/adc.c +From 523770910ace4ad6be25ea056c663525f0428085 Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Mon, 6 Feb 2017 17:31:50 +0000 +Subject: gcc2 + + +diff --git a/adc.c b/adc.c +index caa3a46..3937ec4 100644 +--- a/adc.c ++++ b/adc.c @@ -6,8 +6,6 @@ int adc_decompress(int in_size, unsigned char *input, int avail_size, unsigned char *output, int *bytes_written) @@ -10,7 +17,7 @@ diff -upr dmg2img-1.6.5/adc.c dmg2img-1.6.5-haiku/adc.c bool output_full = false; unsigned char *inp = input; unsigned char *outp = output; -@@ -16,6 +14,9 @@ int adc_decompress(int in_size, unsigned +@@ -16,6 +14,9 @@ int adc_decompress(int in_size, unsigned char *input, int avail_size, unsigned c int offset; int i; @@ -20,9 +27,10 @@ diff -upr dmg2img-1.6.5/adc.c dmg2img-1.6.5-haiku/adc.c while (inp - input < in_size) { chunk_type = adc_chunk_type(*inp); switch (chunk_type) { -diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c ---- dmg2img-1.6.5/dmg2img.c 2013-07-23 11:04:39.000000000 +0000 -+++ dmg2img-1.6.5-haiku/dmg2img.c +diff --git a/dmg2img.c b/dmg2img.c +index 12be603..2c877e3 100644 +--- a/dmg2img.c ++++ b/dmg2img.c @@ -112,6 +112,8 @@ int main(int argc, char *argv[]) char reserved[5] = " "; char sztype[64] = ""; @@ -68,7 +76,7 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c data_begin = strstr(data_begin, chunk_begin); if (!data_begin) break; -@@ -267,7 +270,7 @@ int main(int argc, char *argv[]) +@@ -266,7 +269,7 @@ int main(int argc, char *argv[]) if (!parts) mem_overflow(); @@ -77,7 +85,7 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c if (!base64data) mem_overflow(); base64data[data_size] = '\0'; -@@ -300,6 +303,8 @@ int main(int argc, char *argv[]) +@@ -303,6 +306,8 @@ int main(int argc, char *argv[]) printf("partition %d: %s\n", i, partname); } } else if (kolyblk.RsrcForkOffset != 0 && kolyblk.RsrcForkLength != 0) { @@ -86,7 +94,7 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c //We have a binary resource fork to parse plist = (char *)malloc(kolyblk.RsrcForkLength); if (!plist) -@@ -307,8 +312,7 @@ int main(int argc, char *argv[]) +@@ -310,8 +315,7 @@ int main(int argc, char *argv[]) fseeko(FIN, kolyblk.RsrcForkOffset, SEEK_SET); fread(plist, kolyblk.RsrcForkLength, 1, FIN); partnum = 0; @@ -96,7 +104,7 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c mish_begin = plist + 0x104; while (1) { mish_begin += next_mishblk; -@@ -372,6 +376,7 @@ int main(int argc, char *argv[]) +@@ -375,6 +379,7 @@ int main(int argc, char *argv[]) in_offs = add_offs = in_offs_add = kolyblk.DataForkOffset; for (i = extractpart==-1?0:extractpart; i < (extractpart==-1?partnum:extractpart+1) && in_offs < kolyblk.DataForkLength - kolyblk.DataForkOffset; i++) { @@ -104,7 +112,7 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c if (verbose) printf("opening partition %d ... ", i); if (verbose >= 3) -@@ -385,7 +390,7 @@ int main(int argc, char *argv[]) +@@ -388,7 +393,7 @@ int main(int argc, char *argv[]) if (debug) { fprintf(FDBG, "\n run..... ..type.... ..reserved ..sectorStart..... ..sectorCount..... ..compOffset...... ..compLength......\n"); } @@ -113,7 +121,7 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c while (block_type != BT_TERM && offset < parts[i].BlocksRunCount * 0x28) { block_type = convert_char4((unsigned char *)parts[i].Data + offset); dw_reserved = convert_char4((unsigned char *)parts[i].Data + offset + 4); -@@ -547,14 +552,14 @@ int main(int argc, char *argv[]) +@@ -550,14 +555,14 @@ int main(int argc, char *argv[]) fseeko(FIN, in_offs + add_offs, SEEK_SET); to_read = in_size; while (to_read > 0) { @@ -130,10 +138,11 @@ diff -upr dmg2img-1.6.5/dmg2img.c dmg2img-1.6.5-haiku/dmg2img.c fwrite(dtmp, 1, bytes_written, FOUT); to_read -= read_from_input; } -diff -upr dmg2img-1.6.5/mntcmd.h dmg2img-1.6.5-haiku/mntcmd.h ---- dmg2img-1.6.5/mntcmd.h 2010-03-24 17:52:45.000000000 +0000 -+++ dmg2img-1.6.5-haiku/mntcmd.h -@@ -19,16 +19,17 @@ void read_gpt_entry(FILE * F, struct _gp +diff --git a/mntcmd.h b/mntcmd.h +index 0e3a8fe..7c7da52 100644 +--- a/mntcmd.h ++++ b/mntcmd.h +@@ -19,16 +19,17 @@ void read_gpt_entry(FILE * F, struct _gpt_entry *e) int print_mountcmd(char *filename) { @@ -155,3 +164,6 @@ diff -upr dmg2img-1.6.5/mntcmd.h dmg2img-1.6.5-haiku/mntcmd.h fseeko(F, 0x200, SEEK_SET); read_gpt_header(F, &gpt_header); +-- +2.11.1 +