diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-09-01 19:57:58 -0700 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2021-09-05 21:28:20 +0200 |
| commit | fe1942a87df253c0fef252efe7556907880207c9 (patch) | |
| tree | 8f432049d6031148d31d0d9e5541b405a3b614f2 | |
| parent | af8a5d240b6eb0381b92f79dac14143c526a68cc (diff) | |
| download | upstream-fe1942a87df253c0fef252efe7556907880207c9.tar.gz upstream-fe1942a87df253c0fef252efe7556907880207c9.tar.bz2 upstream-fe1942a87df253c0fef252efe7556907880207c9.zip | |
tools/dosfstools: update to 4.2
Remove upstream backport.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | tools/dosfstools/Makefile | 4 | ||||
| -rw-r--r-- | tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch | 27 |
2 files changed, 2 insertions, 29 deletions
diff --git a/tools/dosfstools/Makefile b/tools/dosfstools/Makefile index e34ceaf32b..d52c46b302 100644 --- a/tools/dosfstools/Makefile +++ b/tools/dosfstools/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dosfstools PKG_CPE_ID:=cpe:/a:dosfstools_project:dosfstools -PKG_VERSION:=4.1 +PKG_VERSION:=4.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \ http://fossies.org/linux/misc -PKG_HASH:=e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 +PKG_HASH:=ba7c716ff9b8208a3bba5094a77584a7dc814141de09ab4ce1ae9b84bbcd7844 HOST_FIXUP:=autoreconf diff --git a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch b/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch deleted file mode 100644 index ea93320821..0000000000 --- a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1c6c135ee15e449c1bf2e76d5307f83a3a1d7425 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> -Date: Tue, 11 Oct 2016 12:07:48 +0200 -Subject: [PATCH] Switch to AC_CHECK_LIB for iconv library linking. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -AC_SEARCH_LIB doesn't work properly for openwrt/lede when building dosfstools -as a package. - -Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ if test "x$with_udev" != "xno"; then - [true]) - fi - --AC_SEARCH_LIBS(iconv_open, iconv) -+AC_CHECK_LIB(iconv, iconv_open) - - # xxd (distributed with vim) is used in the testsuite - AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) |