From 6f8a4904e17dfcb7536d32e274119a3f81333fa9 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Oct 26 2020 21:25:00 +0000
Subject: Fix building with OpenSSL 1.1


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index 86ae03e..d884eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /dmg2img-1.6.2.tar.gz
 /dmg2img-1.6.5.tar.gz
 /dmg2img-1.6.7.tar.gz
+/dmg2img-1.6.7.git.tar.gz
diff --git a/dmg2img-1.6.2-nostrip.patch b/dmg2img-1.6.2-nostrip.patch
deleted file mode 100644
index f2a3914..0000000
--- a/dmg2img-1.6.2-nostrip.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0fb1332182c7fcfc86f1b84f46a0619dd62d4815 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 28 Oct 2011 10:41:45 +0200
-Subject: [PATCH] Do not strip binaries
-
----
- Makefile |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5ffbd48..ce22c09 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,7 @@ 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
-@@ -17,11 +17,11 @@ 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}
--	install -c -s -m 755 -o root -g root dmg2img vfdecrypt $(BIN_DIR)
-+	install -c -m 755 -o root -g root dmg2img vfdecrypt $(BIN_DIR)
- 
- clean:
- 	rm -f dmg2img vfdecrypt *~ *.o core
--- 
-1.7.1
-
diff --git a/dmg2img.spec b/dmg2img.spec
index 73fa70c..25c069b 100644
--- a/dmg2img.spec
+++ b/dmg2img.spec
@@ -1,16 +1,19 @@
+%global git_tag f16f247d30f868e84f31e24792b4464488f1c009
+%global short_tag %(c=%{git_tag}; echo ${c:0:7})
+
 Summary:        Uncompress the Apple compressed disk image files
 Name:           dmg2img
 Version:        1.6.7
-Release:        9%{?dist}
+Release:        10.20170502.git.f16f247%{?dist}
 # dmg2img is GPL without specific version
 # vfdecrypt is MIT licensed
 License:        GPL+ and MIT
-Source0:        http://vu1tur.eu.org/tools/%{name}-%{version}.tar.gz
-Patch0:         dmg2img-1.6.2-nostrip.patch
+#Source0:        http://vu1tur.eu.org/tools/%{name}-%{version}.tar.gz
+Source0:        https://github.com/Lekensteyn/%{name}/archive/%{git_tag}/%{name}-%{version}.git.tar.gz
 URL:            http://vu1tur.eu.org/tools/
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(openssl) < 1.1.0
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
 
 
@@ -20,8 +23,7 @@ files into plain disk or filesystem images.
 
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1 -n %{name}-%{git_tag}
 
 
 %build
@@ -43,6 +45,9 @@ install -D -p -m 0644 vfdecrypt.1 %{buildroot}%{_mandir}/man1/vfdecrypt.1
 
 
 %changelog
+* Mon Oct 26 2020 Peter Lemenkov <lemenkov@gmail.com> - 1.6.7-10.20170502.git.f16f247
+- Fix building with OpenSSL 1.1
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index f58668b..3afe0f3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (dmg2img-1.6.7.tar.gz) = 4c42841c5cdbf868b6038648a6c83e78d4b7f2010f7065d7b3f4c2c04d13af9489716c1dfa867aff5f3c3b3eef96dc3fc0610eff13fec139265f37f468e339e6
+SHA512 (dmg2img-1.6.7.git.tar.gz) = 6b50e42d2b4ab67c9da476bdc8e40bd5291e6c4677d5e9a56a24761244a8e56e0d738393dc7295f3b0f413aef5c934a7feff6ea49b9bd9dca018e86c1b4f136d