From 898071df1ad1053d6679768fa2638b50b860a216 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 5 Jan 2015 17:04:20 +0100 Subject: [PATCH] Import from dmg2img-1.6.5.tar.gz (removed execute bits from extracted files) 1.6.5 23 July 2013 * Fixed a bug in handling some types of dmg files http://vu1tur.eu.org/tools/dmg2img-1.6.5.tar.gz bytes 23442 mtime Tue, 23 Jul 2013 12:12:55 +0000 md5 d01b01151759dd25e16d0c37d4a57b3c sha1 87db4a19badfde40d007a76092454b0942df2bf4 sha256 400a16cbe5cb2bf8a9eec4a43ef3546e0329f248bbd2a79f6d9a1ebc0b503308 Signed-off-by: Peter Wu --- README | 2 + dmg2img.c | 6 +- dmg2img.spec | 187 --------------------------------------------------- 3 files changed, 5 insertions(+), 190 deletions(-) delete mode 100644 dmg2img.spec diff --git a/README b/README index b9086d0..39564fc 100644 --- a/README +++ b/README @@ -109,5 +109,7 @@ CHANGELOG: 1.6.4 25 April 2012 * Compilation bugfix (Linux) +1.6.5 23 July 2013 + * Fixed a bug in handling some types of dmg files http://vu1tur.eu.org/dmg2img \ No newline at end of file diff --git a/dmg2img.c b/dmg2img.c index b11c12f..739e1f8 100644 --- a/dmg2img.c +++ b/dmg2img.c @@ -16,7 +16,7 @@ */ #define _FILE_OFFSET_BITS 64 -#define VERSION "dmg2img v1.6.4 (c) vu1tur (to@vu1tur.eu.org)" +#define VERSION "dmg2img v1.6.5 (c) vu1tur (to@vu1tur.eu.org)" #define USAGE "\ Usage: dmg2img [-l] [-p N] [-s] [-v] [-V] [-d] []\n\ or dmg2img [-l] [-p N] [-s] [-v] [-V] [-d] -i -o \n\n\ @@ -600,9 +600,9 @@ int main(int argc, char *argv[]) } else if (block_type == BT_TERM) { if (in_offs == 0 && partnum > i+1) { if (convert_char8((unsigned char *)parts[i+1].Data + 24) != 0) - in_offs_add = 0; + in_offs_add = kolyblk.DataForkOffset; } else - in_offs_add = 0; + in_offs_add = kolyblk.DataForkOffset; if (verbose >= 3) printf("terminator\n"); diff --git a/dmg2img.spec b/dmg2img.spec deleted file mode 100644 index 6ed27a3..0000000 --- a/dmg2img.spec +++ /dev/null @@ -1,187 +0,0 @@ -%define myrelease 1 -%define mybuild 1 -%define _rel %{myrelease}.%{mybuild} - -# define the package groups. -# If they all followed the same naming conventions these would be the same. -# They don't, so they probably aren't :( -# -%define suse_group Productivity/File utilities -%define mandriva_group Productivity/File utilities -%define fedora_group Productivity/File utilities - -# defaults -# -%define group Productivity/File utilities -%define rel %{_rel} - -%define my_suse 0 -%define my_mandriva 0 -%define my_fedora 0 -%define my_centos 0 - - -%if 0%{?suse_version:1}%{?sles_version:1} -%define my_suse 1 -%endif - -%if 0%{?mandriva_version:1} -%define my_mandriva 1 -%endif - -%if 0%{?fedora_version:1} -%define my_fedora 1 -%endif - -%if 0%{?centos_version:1} -%define my_centos 1 -%endif - - -%if %{my_suse} - -%if %{suse_version} -%define rel %{_rel}.suse%(echo $[%suse_version/10]) -%else -%define rel %{_rel}.%{sles_version} -%endif - -%define group %{suse_group} - -%endif - - -# building on a Mandriva/Mandrake Linux system. -# -# this should create a release that conforms to the Mandriva naming conventions. -# -%if %{my_mandriva} - -%{?!mkrel:%define mkrel(c:) %{-c:0.%{-c''}.}%{!?''with''unstable:%(perl -e '$''="%{1}";m/(.\'''\\D\+)?(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').\ -%{?subrel:%subrel}%{!?subrel:1}.\ -%{?distversion:%distversion}\ -%{?!distversion:%(echo $[%{mdkversion}/10])}}\ -%{?''with_unstable:%{1}}\ -%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}} - -%define rel %mkrel %{_rel} - -%define group %{mandriva_group} - -%endif - - -# building on a Fedora Core Linux system. -# -# this should create a release that conforms to the Fedora naming conventions. -# -%if %{my_fedora} - -%if 0%{?!dist:1} -%define dist fc%{fedora_version} -%endif - -%define rel %{myrelease}.%{dist}.%{mybuild} -%define group %{fedora_group} - -%endif - - -# building on a CentOS Linux system? -# -# if so, this should create a release that conforms to the CentOS naming conventions. -# -%if 0%{?centos_version:1}>0 - -%if 0%{?!dist:1} -%define dist el%(echo $[%{centos_version}/100]) -%endif - -%define my_centos 1 -%define rel %{myrelease}.%{dist} -%define group %{fedora_group} - -%endif - - -%if %{my_suse} - -%if %{suse_version}>1020 -BuildRequires: libopenssl-devel -%else - -%if %{sles_version}>10 -BuildRequires: libopenssl-devel -%else -BuildRequires: openssl-devel -%endif - -%endif - -%endif - -%if %{my_mandriva} -BuildRequires: libopenssl-devel -%endif - -%if %{my_fedora} -BuildRequires: openssl-devel -%endif - -%if %{my_centos} -BuildRequires: openssl-devel -%endif - - -# Now for the meat of the spec file -# -Name: dmg2img -Summary: Converts dmg archives to HFS+ images -Version: 1.6.3 -Release: 4.1 -Group: %{group} -License: GPLv2 -Source: %{name}-%{version}.tar.gz -URL: http://vu1tur.eu.org/tools/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - - -%description -DMG2IMG is a tool which allows converting Apple compressed dmg -archives to standard (hfsplus) image disk files. - -This tool handles z-lib compressed dmg images. - - -%prep -%setup -q - - -%build -%{__make} CFLAGS="$RPM_OPT_FLAGS" - - -%install -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_mandir}/man1 -install -m755 %{name} %{buildroot}%{_bindir}/ -install -m755 vfdecrypt %{buildroot}%{_bindir}/ -install -m644 vfdecrypt.1 %{buildroot}%{_mandir}/man1/ - - -%files -%defattr(-,root,root,0755) -%{_bindir}/%{name} -%{_bindir}/vfdecrypt -%{_mandir}/man1/vfdecrypt.1* -%doc COPYING README - - -%clean -%{__rm} -rf %{buildroot} -%{__rm} -rf %{_builddir}/%{name}-%{version}-%{release}-buildroot - - -%changelog -* Thu Sep 25 2008 David Bolt -- First spec and build for SUSE.