From 9ccfb32818c91b30ad25408dda43c2dbc368480e Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:40:33 +0100
Subject: [PATCH] update to 332.25 [release 332.25-1mamba;Sun Jun 26 2016]

---
 hfstools-332.14-fix_link_with_gold.patch    | 12 ------------
 hfstools-332.14-fix_link_with_openssl.patch | 12 ++++++++++++
 hfstools.spec                               | 16 ++++++++++------
 3 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 hfstools-332.14-fix_link_with_openssl.patch

diff --git a/hfstools-332.14-fix_link_with_gold.patch b/hfstools-332.14-fix_link_with_gold.patch
index 5edac56..e553cfb 100644
--- a/hfstools-332.14-fix_link_with_gold.patch
+++ b/hfstools-332.14-fix_link_with_gold.patch
@@ -8,15 +8,3 @@ diff -Nru diskdev_cmds-332.14.orig/Makefile.lnx diskdev_cmds-332.14/Makefile.lnx
  SUBDIRS := newfs_hfs.tproj fsck_hfs.tproj
  
  all clean:
-diff -Nru diskdev_cmds-332.14.orig/newfs_hfs.tproj/Makefile.lnx diskdev_cmds-332.14/newfs_hfs.tproj/Makefile.lnx
---- diskdev_cmds-332.14.orig/newfs_hfs.tproj/Makefile.lnx	2012-02-25 21:05:44.336332916 +0100
-+++ diskdev_cmds-332.14/newfs_hfs.tproj/Makefile.lnx	2012-02-25 21:07:03.048447076 +0100
-@@ -4,7 +4,7 @@
- all: newfs_hfs
- 
- newfs_hfs: $(OFILES)
--	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lssl
-+	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lssl -lcrypto
- 
- clean:
- 	$(RM) newfs_hfs $(OFILES)
diff --git a/hfstools-332.14-fix_link_with_openssl.patch b/hfstools-332.14-fix_link_with_openssl.patch
new file mode 100644
index 0000000..8b498e3
--- /dev/null
+++ b/hfstools-332.14-fix_link_with_openssl.patch
@@ -0,0 +1,12 @@
+diff -Nru diskdev_cmds-332.14.orig/newfs_hfs.tproj/Makefile.lnx diskdev_cmds-332.14/newfs_hfs.tproj/Makefile.lnx
+--- diskdev_cmds-332.14.orig/newfs_hfs.tproj/Makefile.lnx	2012-02-25 21:05:44.336332916 +0100
++++ diskdev_cmds-332.14/newfs_hfs.tproj/Makefile.lnx	2012-02-25 21:07:03.048447076 +0100
+@@ -4,7 +4,7 @@
+ all: newfs_hfs
+ 
+ newfs_hfs: $(OFILES)
+-	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lssl
++	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lssl -lcrypto
+ 
+ clean:
+ 	$(RM) newfs_hfs $(OFILES)
diff --git a/hfstools.spec b/hfstools.spec
index f503a26..c596155 100644
--- a/hfstools.spec
+++ b/hfstools.spec
@@ -1,6 +1,6 @@
 Name:          hfstools
-Version:       332.14
-Release:       5mamba
+Version:       332.25
+Release:       1mamba
 Summary:       Tools to initialize and repair HFS and HFS+ filesystems
 Group:         System/Tools
 Vendor:        openmamba
@@ -8,12 +8,15 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://opensource.apple.com
 Source:        http://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-%{version}.tar.gz
+Source1:       http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_%{version}-11.debian.tar.gz
 Patch0:        http://www.ecl.udel.edu/%7Emcgee/diskdev_cmds/diskdev_cmds-332.14.patch.bz2
 Patch1:        %{name}-332.14-fsck_checkfs.patch
 Patch2:        %{name}-332.14-fix_link_with_gold.patch
+Patch3:        hfstools-332.14-fix_link_with_openssl.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: libbsd-devel
 BuildRequires: libopenssl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libopenssl-devel >= 0.9.7h
@@ -23,10 +26,8 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 Tools to initialize and repair HFS and HFS+ filesystems.
 
 %prep
-%setup -q -n diskdev_cmds-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n diskdev_cmds-%{version} -a1
+cat debian/patches/*.patch|patch -p1
 
 %build
 %make -f Makefile.lnx
@@ -53,6 +54,9 @@ ln -s fsck.hfsplus %{buildroot}/sbin/fsck.hfs
 %{_mandir}/man8/fsck.hfsplus.8.gz
 
 %changelog
+* Sun Jun 26 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 332.25-1mamba
+- update to 332.25
+
 * Sat Feb 25 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 332.14-5mamba
 - added a patch to fix build using binutils gold linker