diff options
| author | Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> | 2016-06-22 21:37:23 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-06-22 19:32:07 +0200 |
| commit | 819cf75c408e1f03f95d516d87361d0047079d5b (patch) | |
| tree | 940841fb5bb4a02e3b940357cbc0a18e65ed36b6 /tools | |
| parent | 636089ead6864364798ac988299429d171051c0e (diff) | |
| download | master-31e0f0ae-819cf75c408e1f03f95d516d87361d0047079d5b.tar.gz master-31e0f0ae-819cf75c408e1f03f95d516d87361d0047079d5b.tar.bz2 master-31e0f0ae-819cf75c408e1f03f95d516d87361d0047079d5b.zip | |
tools: e2fsprogs: bump to 1.43.1
Bump e2fsprogs to v1.43.1 & refresh patches
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/e2fsprogs/Makefile | 5 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/002-dont-build-e4defrag.patch | 2 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/003-openbsd-compat.patch | 12 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/004-freebsd-compat.patch | 2 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/005-darwin-compat.patch | 1 |
5 files changed, 6 insertions, 16 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index e102759925..1251361b3e 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.42.13 -PKG_MD5SUM:=bc759fc62666786f5436e2075beb3265 +PKG_VERSION:=1.43.1 +PKG_MD5SUM:=1775f3f0eed9dee1c5f39e08d1964a97 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -23,6 +23,7 @@ HOST_CFLAGS += $(FPIC) HOST_CONFIGURE_ARGS += \ --disable-elf-shlibs \ + --enable-libuuid \ --disable-tls \ --disable-nls diff --git a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch index 9f6e7b1cef..2a7842f655 100644 --- a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch +++ b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch @@ -8,4 +8,4 @@ +@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= @DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8 - @IMAGER_CMT@E2IMAGE_PROG= e2image + @LINUX_CMT@E4CRYPT_PROG = e4crypt diff --git a/tools/e2fsprogs/patches/003-openbsd-compat.patch b/tools/e2fsprogs/patches/003-openbsd-compat.patch index ded0ecad77..492b8a8860 100644 --- a/tools/e2fsprogs/patches/003-openbsd-compat.patch +++ b/tools/e2fsprogs/patches/003-openbsd-compat.patch @@ -1,6 +1,6 @@ --- a/lib/blkid/getsize.c +++ b/lib/blkid/getsize.c -@@ -25,6 +25,9 @@ +@@ -29,6 +29,9 @@ #include <fcntl.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> @@ -10,13 +10,3 @@ #endif #ifdef HAVE_LINUX_FD_H #include <linux/fd.h> ---- a/lib/quota/mkquota.c -+++ b/lib/quota/mkquota.c -@@ -8,6 +8,7 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <errno.h> -+#include <stdint.h> - #include <string.h> - #include <fcntl.h> - diff --git a/tools/e2fsprogs/patches/004-freebsd-compat.patch b/tools/e2fsprogs/patches/004-freebsd-compat.patch index c6435d4919..d102e1cd9c 100644 --- a/tools/e2fsprogs/patches/004-freebsd-compat.patch +++ b/tools/e2fsprogs/patches/004-freebsd-compat.patch @@ -1,6 +1,6 @@ --- a/lib/ext2fs/tdb.c +++ b/lib/ext2fs/tdb.c -@@ -56,7 +56,9 @@ +@@ -58,7 +58,9 @@ Last Changed Date: 2007-06-22 13:36:10 - #include <utime.h> #endif #include <sys/stat.h> diff --git a/tools/e2fsprogs/patches/005-darwin-compat.patch b/tools/e2fsprogs/patches/005-darwin-compat.patch index c5d0e28c55..d84aa121ca 100644 --- a/tools/e2fsprogs/patches/005-darwin-compat.patch +++ b/tools/e2fsprogs/patches/005-darwin-compat.patch @@ -20,4 +20,3 @@ #ifndef HAVE___U8 #define HAVE___U8 #ifdef __U8_TYPEDEF - |