main/dosfstools: upgrade to 4.0

2 files changed, 17 insertions, 26 deletions

diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index ccd5d50f3d..c47a7988f7 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dosfstools
-pkgver=3.0.28
+pkgver=4.0
 pkgrel=0
 pkgdesc="DOS filesystem utilities"
 url="https://github.com/dosfstools/dosfstools"
 arch="all"
 license="GPL3+"
 depends=""
-makedepends="linux-headers"
+makedepends="linux-headers autoconf automake libtool"
 subpackages="$pkgname-doc"
 source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.xz
-        musl-fixes.patch
         "
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -21,25 +20,28 @@ prepare() {
                 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
                 esac
         done
+        autoreconf -vif
 }
 
 build() {
         cd "$_builddir"
-        make OPTFLAGS="$CFLAGS -D_GNU_SOURCE" || return 1
+        ./configure \
+                --build=$CBUILD \
+                --host=$CHOST \
+                --prefix=/usr \
+                --sysconfdir=/etc \
+                --mandir=/usr/share/man \
+                --localstatedir=/var \
+                --disable-nls \
+                || return 1
+        make || return 1
 }
 
 package() {
         cd "$_builddir"
-        make DESTDIR="$pkgdir" \
-                PREFIX=/usr \
-                MANDIR=/usr/share/man \
-                DOCDIR=/usr/share/doc \
-                install  || return 1
+        make DESTDIR="$pkgdir" install  || return 1
 }
 
-md5sums="6a047a6c65186b9ebb1853709adb36db  dosfstools-3.0.28.tar.xz
-1212883d87460982d9a62ed0f9825589  musl-fixes.patch"
-sha256sums="ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2  dosfstools-3.0.28.tar.xz
-11dcbec3639e2f1977bf1fc9eb12ee25c07c494079903a9bdf62d1cc4b6bd281  musl-fixes.patch"
-sha512sums="7325a9e05f51715b358cab0a8fa8f8096422b470f1a43eecfab2adbb954e1daf6a24003121be5b3a22de5fcb3e3adffbf1551e2158852b6663fd57a109f057ad  dosfstools-3.0.28.tar.xz
-c1e4ccf8ce4ac828895f783f7c5feffacee8dc6197e62b6987498bbf016646fe88b01ca510b24eb45d63df1b6dab43247f8ed30191fccead408952c0dcb3434f  musl-fixes.patch"
+md5sums="20f8388b99702f276c973d228c7cff45  dosfstools-4.0.tar.xz"
+sha256sums="9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf  dosfstools-4.0.tar.xz"
+sha512sums="81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58  dosfstools-4.0.tar.xz"
diff --git a/main/dosfstools/musl-fixes.patch b/main/dosfstools/musl-fixes.patch
deleted file mode 100644
index 462aacfb9a..0000000000
--- a/main/dosfstools/musl-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mkfs.fat.c.orig
-+++ ./src/mkfs.fat.c
-@@ -1412,7 +1412,7 @@
- 
-     gettimeofday(&create_timeval, NULL);
-     create_time = create_timeval.tv_sec;
--    volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);  /* Default volume ID = creation time, fudged for more uniqueness */
-+    volume_id = (uint32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);   /* Default volume ID = creation time, fudged for more uniqueness */
-     check_atari();
- 
-     printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n");