From a46390537d1b2369c366df4255b81618f016f19e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 4 Sep 2017 22:11:21 +0300 Subject: [PATCH] e2fsprogs: bump to version 1.43.6 Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...02-include-sys-sysmacros.h-as-needed.patch | 129 ------------------ package/e2fsprogs/e2fsprogs.hash | 4 +- package/e2fsprogs/e2fsprogs.mk | 2 +- 3 files changed, 3 insertions(+), 132 deletions(-) delete mode 100644 package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch diff --git a/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch b/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch deleted file mode 100644 index c58fcb3217..0000000000 --- a/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 19 May 2017 13:25:59 -0400 -Subject: [PATCH] include sys/sysmacros.h as needed - -The minor/major/makedev macros are not entirely standard. glibc has had -the definitions in sys/sysmacros.h since the start, and wants to move away -from always defining them implicitly via sys/types.h (as this pollutes the -namespace in violation of POSIX). Other C libraries have already dropped -them. Since the configure script already checks for this header, use that -to pull in the header in files that use these macros. - -Signed-off-by: Mike Frysinger -Signed-off-by: Theodore Ts'o - -Upstream commit 3fb715b55426875902dfef3056b2cf7335953178 -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - debugfs/debugfs.c | 3 +++ - lib/blkid/devname.c | 3 +++ - lib/blkid/devno.c | 3 +++ - lib/ext2fs/finddev.c | 3 +++ - lib/ext2fs/ismounted.c | 3 +++ - misc/create_inode.c | 4 ++++ - misc/mk_hugefiles.c | 3 +++ - 7 files changed, 22 insertions(+) - -diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index 059ddc39..453f5b52 100644 ---- a/debugfs/debugfs.c -+++ b/debugfs/debugfs.c -@@ -26,6 +26,9 @@ extern char *optarg; - #include - #endif - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "debugfs.h" - #include "uuid/uuid.h" -diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c -index 3e2efa9d..671e781f 100644 ---- a/lib/blkid/devname.c -+++ b/lib/blkid/devname.c -@@ -36,6 +36,9 @@ - #if HAVE_SYS_MKDEV_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - #include - - #include "blkidP.h" -diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c -index aa6eb907..480030f2 100644 ---- a/lib/blkid/devno.c -+++ b/lib/blkid/devno.c -@@ -31,6 +31,9 @@ - #if HAVE_SYS_MKDEV_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "blkidP.h" - -diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c -index 311608de..62fa0dbe 100644 ---- a/lib/ext2fs/finddev.c -+++ b/lib/ext2fs/finddev.c -@@ -31,6 +31,9 @@ - #if HAVE_SYS_MKDEV_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "ext2_fs.h" - #include "ext2fs.h" -diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c -index bcac0f15..7d524715 100644 ---- a/lib/ext2fs/ismounted.c -+++ b/lib/ext2fs/ismounted.c -@@ -49,6 +49,9 @@ - #if HAVE_SYS_TYPES_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "ext2_fs.h" - #include "ext2fs.h" -diff --git a/misc/create_inode.c b/misc/create_inode.c -index ae22ff6f..8ce3fafa 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -22,6 +22,10 @@ - #include - #endif - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif -+ - #include - #include - #include -diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c -index 049c6f41..5882394d 100644 ---- a/misc/mk_hugefiles.c -+++ b/misc/mk_hugefiles.c -@@ -35,6 +35,9 @@ extern int optind; - #include - #include - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - #include - #include - #include --- -2.13.3 - diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index cf41e3a3d5..2c29b853e0 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.4/sha256sums.asc -sha256 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24 e2fsprogs-1.43.4.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.6/sha256sums.asc +sha256 c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402 e2fsprogs-1.43.6.tar.xz diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 75e9213351..59499bc2c9 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.43.4 +E2FSPROGS_VERSION = 1.43.6 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) -- 2.30.2