--- dmg2img-1.6.1.orig/debian/dmg2img.install +++ dmg2img-1.6.1/debian/dmg2img.install @@ -0,0 +1,2 @@ +dmg2img /usr/bin +vfdecrypt /usr/bin --- dmg2img-1.6.1.orig/debian/copyright +++ dmg2img-1.6.1/debian/copyright @@ -0,0 +1,58 @@ +This package was debianized by Soeren Sonnenburg . + +It was downloaded from http://vu1tur.eu.org/tools/. + +The upstream authors are vu1tur and +Jean-Pierre Demailly . + +Note that the source code resulting in binary dmg2img and the source code +leading to vfdecrypt are released under different licenses. dmg2img is licensed +under the GPL and vfdecrypt under a BSD style license. Also note that merely +vfdecrypt is linked to the openssl but not dmg2img. + +The files dmg2img.{c,h} and base64.{h,cc} are + +Copyright (C) 2004-2009 vu1tur +Copyright (C) 2007-2009 Jean-Pierre Demailly . + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + On Debian systems, you can find the GPL license in: + /usr/share/common-licenses/GPL-2 + +The files vfdecrypt.* are + +Copyright (c) 2006 Ralf-Philipp Weinmann , +Jacob Appelbaum , Christian Fromme + +License: + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. --- dmg2img-1.6.1.orig/debian/dmg2img.manpages +++ dmg2img-1.6.1/debian/dmg2img.manpages @@ -0,0 +1,2 @@ +vfdecrypt.1 +debian/dmg2img.1 --- dmg2img-1.6.1.orig/debian/control +++ dmg2img-1.6.1/debian/control @@ -0,0 +1,19 @@ +Source: dmg2img +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Soeren Sonnenburg +Build-Depends: cdbs, debhelper (>= 5), libssl-dev, zlib1g-dev, libbz2-dev +Standards-Version: 3.8.3 +Homepage: http://advancemame.sourceforge.net/boot-readme.html +XS-Debian-Vcs-Svn: https://bollin.googlecode.com/svn/dmg2img/trunk/ +XS-Debian-Vcs-Browser: http://vu1tur.eu.org/tools/ + +Package: dmg2img +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Tool for converting compress dmg files to hfsplus images + DMG2IMG is a tool which allows converting Apple compressed dmg + archives to standard (hfsplus) image disk files. + . + This tool handles zlib and bzip2 compressed dmg images. --- dmg2img-1.6.1.orig/debian/compat +++ dmg2img-1.6.1/debian/compat @@ -0,0 +1 @@ +5 --- dmg2img-1.6.1.orig/debian/dmg2img.1 +++ dmg2img-1.6.1/debian/dmg2img.1 @@ -0,0 +1,42 @@ +.TH "dmg2img" 1 +.SH NAME +dmg2img \- convert compressed dmg to standard (hfsplus) image disk files +.SH SYNOPSIS +.B dmg2img +[-s] [-v] [-V] [-d] [] +.PP +.B dmg2img +[-s] [-v] [-V] [-d] -i -o +.SH DESCRIPTION +.B dmg2img +is an Apple's compressed dmg to standard (hfsplus) image disk file conversion tool. +.SH OPTIONS +.TP +.B \-i +Path to the input .dmg file. +.TP +.B \-s +Silent operation +.TP +.B \-v +Verbose operation +Try to extract key from input file. +.TP +.B \-V +Extremely verbose operation +.TP +.B \-d +Enable debugging. +.TP +.B \-o +The output file (if left out it will be named .img). +.SH "SEE ALSO" +vfdecrypt(1) +.SH AUTHORS +.TP +vu1tur +.TP +Jean-Pierre Demailly . +.PP +This manual page was written by Soeren Sonnenburg , +for the Debian project (but may be used by others). --- dmg2img-1.6.1.orig/debian/watch +++ dmg2img-1.6.1/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts=filenamemangle=s/.*download.pl\?(.*)/$1/ \ +http://vu1tur.eu.org/tools .*dmg2img-(.*)\.tar\.gz \ + debian debian/orig-tar.sh --- dmg2img-1.6.1.orig/debian/orig-tar.sh +++ dmg2img-1.6.1/debian/orig-tar.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' + +tar xzf $3 +rm -rf dmg2img*/debian +rm -rf dmg2img*/*.spec +tar czf $3 dmg2img* +rm -rf dmg2img-* + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $3 $origDir + echo "moved $3 to $origDir" +fi + +exit 0 + --- dmg2img-1.6.1.orig/debian/changelog +++ dmg2img-1.6.1/debian/changelog @@ -0,0 +1,19 @@ +dmg2img (1.6.1-1ubuntu2) lucid; urgency=low + + * Enable debug symbols to be included in -dbgsym package (LP: #546108) + + -- TJ Thu, 25 Mar 2010 07:00:00 +0000 + +dmg2img (1.6.1-1ubuntu1) lucid; urgency=low + + * debian/rules: Add simple patchsys to CDBS packaging + * Fix segmentation fault caused by incorrect terminator block handling + - backported from upstream 1.6.2 (LP: #546154) + + -- TJ Thu, 25 Mar 2010 05:00:00 +0000 + +dmg2img (1.6.1-1) unstable; urgency=low + + * Initial Release (Closes: #552246) + + -- Soeren Sonnenburg Sun, 25 Oct 2009 12:35:36 +0100 --- dmg2img-1.6.1.orig/debian/dmg2img.lintian-overrides +++ dmg2img-1.6.1/debian/dmg2img.lintian-overrides @@ -0,0 +1 @@ +dmg2img: possible-gpl-code-linked-with-openssl --- dmg2img-1.6.1.orig/debian/rules +++ dmg2img-1.6.1/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +build-arch: debian/build-stamp +debian/build-stamp: + $(MAKE) + touch $@ + +clean:: + $(MAKE) clean + $(RM) debian/build-stamp + +get-orig-source: + uscan --rename --upstream-version 0 || true + @echo successfully retrieved upstream tarball --- dmg2img-1.6.1.orig/debian/README.Debian +++ dmg2img-1.6.1/debian/README.Debian @@ -0,0 +1,16 @@ +Uncompressed .dmg images can be mounted via + +# modprobe hfsplus +# mount -t hfsplus -o loop uncompressed.dmg /mnt + +However, some files are compressed which one may detect using file: + +$ file compressed.dmg +compressed.dmg: VAX COFF executable - version 376 + +Using dmg2img -i compressed.dmg -o uncompressed.img +these can be uncompressed and then become accessible for mount: + +# mount -t hfsplus -o loop uncompressed.img /mnt + + -- Soeren Sonnenburg Wed, 25 Oct 2009 14:12 CEST --- dmg2img-1.6.1.orig/debian/patches/01-process_TERM_blocks_correctly_and_flush_debug_log.patch +++ dmg2img-1.6.1/debian/patches/01-process_TERM_blocks_correctly_and_flush_debug_log.patch @@ -0,0 +1,30 @@ +--- dmg2img-1.6.1/dmg2img.c 2010-03-25 04:21:34.756497421 +0000 ++++ dmg2img-1.6.2/dmg2img.c 2010-03-24 20:42:45.000000000 +0000 +@@ -16,7 +16,7 @@ + */ + + #define _FILE_OFFSET_BITS 64 +-#define VERSION "dmg2img v1.6.1 is derived from dmg2iso by vu1tur (to@vu1tur.eu.org)" ++#define VERSION "dmg2img v1.6.2 is derived from dmg2iso by vu1tur (to@vu1tur.eu.org)" + #define USAGE "\ + Usage: dmg2img [-s] [-v] [-V] [-d] []\n\ + or dmg2img [-s] [-v] [-V] [-d] -i -o \n\n\ +@@ -395,6 +395,7 @@ + (unsigned long long)in_size, + sztype + ); ++ fflush(FDBG); + bi++; + } + if (verbose >= 3) +@@ -556,8 +557,8 @@ + (unsigned long long)out_offs, + (unsigned long long)out_size, reserved); + } else if (block_type == BT_TERM) { +- if (in_offs == 0 && partnum > 0) { +- if (convert_char8((unsigned char *)parts[1].Data + 24) != 0) ++ if (in_offs == 0 && partnum > i+1) { ++ if (convert_char8((unsigned char *)parts[i+1].Data + 24) != 0) + in_offs_add = 0; + } else + in_offs_add = 0; --- dmg2img-1.6.1.orig/debian/patches/02-retain-debug-symbols-for-packaging-dbgsym.patch +++ dmg2img-1.6.1/debian/patches/02-retain-debug-symbols-for-packaging-dbgsym.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile b/Makefile +index 501e046..e7ab0ef 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,12 +1,12 @@ + #CC = gcc + ##CFLAGS = -O3 +-CFLAGS = -O2 -Wall ++CFLAGS = -O2 -Wall -g + BIN_DIR = ${DESTDIR}/usr/bin + + all: dmg2img vfdecrypt + + dmg2img: dmg2img.c dmg2img.h mntcmd.h gpt.h dmg2img.o base64.o adc.o +- $(CC) -s -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2 ++ $(CC) -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2 + + dmg2img.o: dmg2img.c dmg2img.h + $(CC) $(CFLAGS) -c dmg2img.c +@@ -18,7 +18,7 @@ adc.o: adc.c adc.h + $(CC) $(CFLAGS) -c adc.c + + vfdecrypt: vfdecrypt.c +- $(CC) $(CFLAGS) -s -o vfdecrypt vfdecrypt.c -lcrypto ++ $(CC) $(CFLAGS) -o vfdecrypt vfdecrypt.c -lcrypto + + install: dmg2img vfdecrypt + mkdir -p ${BIN_DIR}