Updated package hfsprogs 540.1.linux3-1

1 files changed, 26 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7a39fcdddc0b..88e1b25da602 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,57 +4,52 @@
 # Contributor: Prashant Vaibhav <mercurysquad+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: Rubin Simons <rubin@xs4all.nl>
+# Fedora Team: https://src.fedoraproject.org/rpms/hfsplus-tools
 
 pkgname=hfsprogs
-pkgver=332.25
-pkgrel=15
-pkgdesc="HFS/HFS+ user space utils" 
-arch=('i686' 'x86_64')
-depends=('libbsd' 'openssl')
+pkgver=540.1.linux3
+pkgrel=1
+pkgdesc="User space utils for create and check Apple HFS/HFS+ filesystem"
+arch=('x86_64')
+depends=('openssl')
+makedepends=('libbsd')
 license=('custom:APSL')
 url="http://www.opensource.apple.com/"
-source=("https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${pkgver}.tar.gz"
-        "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${pkgname}_${pkgver}-11.debian.tar.gz"
-        "license"
-        "makefile.patch")
-sha256sums=('74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6'
-            '62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c'
-            '3bce072b604e0e9baa2151bff91b40915253bfb6d9d9e37445080f526ad486e2'
-            '4d9e36010c8bf2b2186ff22b2b30654fb7156bfbbcff0fece717f851f316b6a4')
+source=("http://cavan.codon.org.uk/~mjg59/diskdev_cmds/diskdev_cmds-${pkgver}.tar.gz"
+        "https://src.fedoraproject.org/rpms/hfsplus-tools/raw/master/f/hfsplus-tools-no-blocks.patch"
+        "https://src.fedoraproject.org/rpms/hfsplus-tools/raw/master/f/hfsplus-tools-learn-to-stdarg.patch"
+        "https://src.fedoraproject.org/rpms/hfsplus-tools/raw/master/f/apsl-2.0.txt"
+        "ldflags_relro.patch")
+sha256sums=('b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497'
+            'd78d883f9b485e58d40820595000a8c20ec12f4aff6ca424368b5d1c04b2fe5e'
+            'fb6556be9af656f7a83841db6de92482c697a9d706145d4c6041b5e284bd2820'
+            'e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b'
+            '1bc2a40c66c244f6273b3d102d00bbcf16bbbfc1c6dc4e33f3cc890349bb20f4')
 
 prepare() {
-  # To build the package more than once you have to clear your sources tree after first build
-  # or to use the same sources without patching them again (makepkg -e)
-  #
   # Apply patches
   cd "diskdev_cmds-${pkgver}"
-  for patch in ../debian/patches/*.patch ../makefile.patch
-  do
-    msg2 "Applying patch ${patch##*/}..."
-    patch -Np1 -i "${patch}"
-  done
+  patch -p1 -i "${srcdir}/hfsplus-tools-no-blocks.patch"
+  patch -p1 -i "${srcdir}/hfsplus-tools-learn-to-stdarg.patch"
+  patch -p0 -i "${srcdir}/ldflags_relro.patch"
 }
 
 build() {
   cd "diskdev_cmds-${pkgver}"
-  make -f Makefile.lnx
+  make -f Makefile
 }
 
 package() {
-  # Create required package directories
-  install -m 755 -d "${pkgdir}/usr/bin"
-  install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m 755 -d "${pkgdir}/usr/share/${pkgname}"
-  install -m 755 -d "${pkgdir}/usr/share/man/man8/"
+  cd "diskdev_cmds-${pkgver}"
   # Copy license file
-  install -m 644 "license" "${pkgdir}/usr/share/licenses/${pkgname}/APSL"
+  install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m 644 "${srcdir}/apsl-2.0.txt" "${pkgdir}/usr/share/licenses/${pkgname}/APSL"
   # Copy executable files
-  cd "diskdev_cmds-${pkgver}"
+  install -m 755 -d "${pkgdir}/usr/bin"
   install -m 755 "newfs_hfs.tproj/newfs_hfs" "${pkgdir}/usr/bin/mkfs.hfsplus"
   install -m 755 "fsck_hfs.tproj/fsck_hfs" "${pkgdir}/usr/bin/fsck.hfsplus"
-  # Copy shared data
-  install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "${pkgdir}/usr/share/${pkgname}/hfsbootdata"
   # Copy man pages
+  install -m 755 -d "${pkgdir}/usr/share/man/man8/"
   install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "${pkgdir}/usr/share/man/man8/mkfs.hfsplus.8"
   install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "${pkgdir}/usr/share/man/man8/fsck.hfsplus.8"
 }