From c950169c2ad9965c5dccdd2963147ffdfbacc8c7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 27 Nov 2015 07:31:25 +0100
Subject: dosfstools: update to latest stable, use new github url

---
 package/dosfstools/Makefile                     |  8 ++--
 package/dosfstools/patches/patch-src_mkfs_fat_c | 56 -------------------------
 2 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100644 package/dosfstools/patches/patch-src_mkfs_fat_c

(limited to 'package/dosfstools')

diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index f3270371f..b2ee4eea8 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -4,13 +4,13 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		dosfstools
-PKG_VERSION:=		3.0.26
-PKG_RELEASE:=		5
-PKG_HASH:=		468442fe8cd93961047d5cd67f7b67793126575103a67cd131330512b4893e75
+PKG_VERSION:=		3.0.28
+PKG_RELEASE:=		1
+PKG_HASH:=		ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2
 PKG_DESCR:=		utilities to create and check fat filesystems
 PKG_SECTION:=		sys/fs
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools/
-PKG_SITES:=		http://daniel-baumann.ch/files/software/dosfstools/
+PKG_SITES:=		https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/dosfstools/patches/patch-src_mkfs_fat_c b/package/dosfstools/patches/patch-src_mkfs_fat_c
deleted file mode 100644
index 60703d5f5..000000000
--- a/package/dosfstools/patches/patch-src_mkfs_fat_c
+++ /dev/null
@@ -1,56 +0,0 @@
---- dosfstools-3.0.26.orig/src/mkfs.fat.c	2014-02-08 18:53:10.000000000 +0100
-+++ dosfstools-3.0.26/src/mkfs.fat.c	2014-03-26 13:37:51.000000000 +0100
-@@ -300,7 +300,7 @@ static long do_check(char *buffer, int t
- static void alarm_intr(int alnum);
- static void check_blocks(void);
- static void get_list_blocks(char *filename);
--static int valid_offset(int fd, loff_t offset);
-+static int valid_offset(int fd, off_t offset);
- static uint64_t count_blocks(char *filename, int *remainder);
- static void check_mount(char *device_name);
- static void establish_params(int device_num, int size);
-@@ -477,7 +477,7 @@ static void get_list_blocks(char *filena
- /* Given a file descriptor and an offset, check whether the offset is a valid offset for the file - return FALSE if it
-    isn't valid or TRUE if it is */
- 
--static int valid_offset(int fd, loff_t offset)
-+static int valid_offset(int fd, off_t offset)
- {
-     char ch;
- 
-@@ -492,7 +492,7 @@ static int valid_offset(int fd, loff_t o
- 
- static uint64_t count_blocks(char *filename, int *remainder)
- {
--    loff_t high, low;
-+    off_t high, low;
-     int fd;
- 
-     if ((fd = open(filename, O_RDONLY)) < 0) {
-@@ -506,7 +506,7 @@ static uint64_t count_blocks(char *filen
- 	for (high = 1; valid_offset(fd, high); high *= 2)
- 	    low = high;
- 	while (low < high - 1) {
--	    const loff_t mid = (low + high) / 2;
-+	    const off_t mid = (low + high) / 2;
- 	    if (valid_offset(fd, mid))
- 		low = mid;
- 	    else
-@@ -1299,7 +1299,7 @@ static void setup_tables(void)
- 
- #define seekto(pos,errstr)						\
-   do {									\
--    loff_t __pos = (pos);						\
-+    off_t __pos = (pos);						\
-     if (llseek (dev, __pos, SEEK_SET) != __pos)				\
- 	error ("seek to " errstr " failed whilst writing tables");	\
-   } while(0)
-@@ -1679,7 +1679,7 @@ int main(int argc, char **argv)
- 	    exit(1);		/* The error exit code is 1! */
- 	}
-     } else {
--	loff_t offset = blocks * BLOCK_SIZE - 1;
-+	off_t offset = blocks * BLOCK_SIZE - 1;
- 	char null = 0;
- 	/* create the file */
- 	dev = open(device_name, O_EXCL | O_RDWR | O_CREAT | O_TRUNC, 0666);
-- 
cgit v1.2.3