From 747c5e42f119bf85cfc704e7f67e4804e11e4fd2 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Fri, 4 Dec 2015 14:53:33 -0500 Subject: [PATCH] dosfstools: bump to 3.0.28, fix URLs - dev moved to github Signed-off-by: Ted Hess --- utils/dosfstools/Makefile | 8 ++++---- .../patches/010-consistent_use_of_uint32.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 utils/dosfstools/patches/010-consistent_use_of_uint32.patch diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index 41483f2ef7..f286bc8707 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dosfstools -PKG_VERSION:=3.0.27 +PKG_VERSION:=3.0.28 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ @@ -17,9 +17,9 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=David Bonnes PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://daniel-baumann.ch/files/software/dosfstools \ +PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \ http://fossies.org/linux/misc -PKG_MD5SUM:=2e31e7bdf92998e41ed17de505a4a552 +PKG_MD5SUM:=64e3b3a59b51d2a97d7ac38b23a124bb include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/nls.mk define Package/dosfstools/Default SECTION:=utils CATEGORY:=Utilities - URL:=http://www.daniel-baumann.ch/software/dosfstools/ + URL:=https://github.com/dosfstools SUBMENU:=Filesystem DEPENDS:=$(ICONV_DEPENDS) endef diff --git a/utils/dosfstools/patches/010-consistent_use_of_uint32.patch b/utils/dosfstools/patches/010-consistent_use_of_uint32.patch new file mode 100644 index 0000000000..73529c873d --- /dev/null +++ b/utils/dosfstools/patches/010-consistent_use_of_uint32.patch @@ -0,0 +1,13 @@ +Index: dosfstools-3.0.28/src/mkfs.fat.c +=================================================================== +--- dosfstools-3.0.28.orig/src/mkfs.fat.c ++++ dosfstools-3.0.28/src/mkfs.fat.c +@@ -1412,7 +1412,7 @@ int main(int argc, char **argv) + + 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"); -- 2.30.2