0a150e97d4
This updates: * m4 * bison * e2fsprogs * make_ext4fs * mtd-utils * findutils * squashfs * squashfs4 * grub2 to their version used in LEDE v17.01.6. This fixes various compile errors appearing on Debian Sid. A list of the patches picked from upstream: m4: $ git log --oneline f7e56763e1..HEAD tools/m4 6e78c5502c tools: m4: fix compilation with glibc 2.28 a91d8dd162 tools/m4: update 1.4.18 f19d47f848 tools: patch various gnu tools for macOS 10.13 720b99215d treewide: clean up download hashes bison: $ git log --oneline 877f2972d4..HEAD tools/bison 1e09cbf118 tools/bison: Update to 3.0.5 f19d47f848 tools: patch various gnu tools for macOS 10.13 720b99215d treewide: clean up download hashes 5062cff673 tools/bison: update to 3.0.4 e2fsprogs: $ git log --oneline f7e56763e1..HEAD tools/e2fsprogs/ 8f5c55f63e tools/e2fsprogs: update to 1.44.1 d35a7bf4b4 e2fsprogs: bump to 1.44.0 79ac69d9c9 tools/e2fsprogs: Update to 1.43.7 5d9114c9cb tools/e2fsprogs: Update to 1.43.6 7955fab22a tools/e2fsprogs: Update to 1.43.5 866e5b4956 tools/e2fsprogs: Update to 1.43.4 a964738a5c Revert "tools/e2fsprogs: fix building on a glibc 2.27 host" 58a95f0f8f tools/e2fsprogs: fix building on a glibc 2.27 host 720b99215d treewide: clean up download hashes b8b807b1a9 tools/e2fsprogs: Update to 1.43.3 d635ef50c5 e2fsprogs: fix build problem with very old libmagic 819cf75c40 tools: e2fsprogs: bump to 1.43.1 2baf90a84e tools/e2fsprogs: remove outdated configure args b7e946f33e tools/e2fsprogs: update to 1.42.13 52ea491bdf tools/e2fsprogs: add a darwin-compat patch make-ext4fs: $ git log --oneline 1170a3de76..HEAD tools/make-ext4fs/ c7c1cf5618 treewide: clean up and unify PKG_VERSION for git based downloads 720b99215d treewide: clean up download hashes 9edfe7dd13 source: Switch to xz for packages and tools where possible 95bad62f2a tools: make_ext4fs: switch to LEDE git mirror 98b960c218 tools: make_ext4fs: support creating empty filesystem images 9ec4ca525c tools: make-ext4fs: fix build regression on mac os x 49ad0c565a tools: fix make_ext4fs build with recent glibc 8af9119ff4 tools: make-ext4fs: explicitely request C collation for sorting 01fb448d56 tools/make-ext4fs: prefer static linking $ git log --oneline 17ae95bb20..HEAD tools/mtd-utils 96dbf59e5a tools/mtd-utils: include sysmacros.h explicitly 018d80007e kernel: remove ubifs xz decompression support c7c1cf5618 treewide: clean up and unify PKG_VERSION for git based downloads 720b99215d treewide: clean up download hashes 9edfe7dd13 source: Switch to xz for packages and tools where possible e27c8bb156 update mtd-utils to 1.5.2 $ git log --oneline dd86bc73fb..HEAD tools/findutils 6449ed1553 tools: findutils: fix compilation with glibc 2.28 d2fd6412a6 tools/findutils: include sysmacros.h explicitly 720b99215d treewide: clean up download hashes 70a5c062f1 tools/findutils: Update to 4.6.0 $ git log --oneline f7e56763e1..HEAD tools/squashfs tools/squashfs4 1aedf2f149 tools/squashfs: use host cflags 8a48a53dcb tools/squashfs4: include sysmacros.h explicitly 8406e50df5 tools/squashfs: include sysmacros.h explicitly 720b99215d treewide: clean up download hashes f97ad870e1 squashfs4: use upstream xz compression header format d437c72c21 tools/squashfs4: refresh patches 34124de139 tools/squashfs: refresh patches fd1c1b4918 tools/squashfs: add argument -fixed-time to set all timestamps $ git log --oneline fcc6f801ca..HEAD package/boot/grub2/ 2252731af4 grub2: rebase patches 6aae528cc3 grub2: Fix CVE-2015-8370 6e1e2e7b96 package/grub2: update to 2.02 10182cb2c6 grub2: update to 2.02~rc2 f0e8470aa9 grub2: update to 2.02~rc1 806d3cc2c3 packages: mark packages depending on a target as nonshared 65c8f2890c grub2: upgrade to 2.02-beta3 (3 years newer than previous) 77812cdfec grub2: disable 'check-macro-version' build rule in 'po' build 2b54fa4dff grub2: do not generate mkfonts at build time b33845b2da grub2: add PKG_FIXUP:=autoreconf 720b99215d treewide: clean up download hashes 3c52cbfa53 Revert "grub2: add PKG_FIXUP:=autoreconf" a0ea22ac43 grub2: add PKG_FIXUP:=autoreconf f2752f4735 grub2: add missing SECTION variable and remove non breaking space d140648622 grub2: move to Boot Loaders category 59e3a4714a grub2: switch back to installing to STAGING_DIR_HOST 9b01282515 grub2: disable stack-protector 25eddec9cb grub2: fix build against musl $ git log --oneline 81a2f9d6f86 81a2f9d6f8 target/linux/x86/image: add explicit prefix to grub-mkimage command Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
134 lines
4.1 KiB
Diff
134 lines
4.1 KiB
Diff
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
|
|
Date: Fri, 8 Sep 2017 09:42:23 +0200
|
|
Subject: tools/e2fsprogs: Update to 1.43.6
|
|
|
|
Update e2fsprogs to 1.43.6
|
|
* Remove FreeBSD patch as it's not needed, FreeBSD 9.1 is EoL and this
|
|
is compiling on FreeBSD 11.1.
|
|
* Remove libmagic patch, RHEL 5 is EoL (End of Production Phase) since
|
|
March 31, 2017.
|
|
|
|
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
|
|
(cherry picked from commit ed617fd8f2f39e18ad435883db5b4100e6f7f977)
|
|
|
|
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
|
|
index 04befc9c809da031a9b9a062a6eb4f73a19c65ca..0c054b13cab1ebe13ddb0c9c347c589ad7ed05f2 100644
|
|
--- a/tools/e2fsprogs/Makefile
|
|
+++ b/tools/e2fsprogs/Makefile
|
|
@@ -8,8 +8,8 @@
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=e2fsprogs
|
|
-PKG_VERSION:=1.43.5
|
|
-PKG_HASH:=261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17
|
|
+PKG_VERSION:=1.43.6
|
|
+PKG_HASH:=c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402
|
|
PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
|
diff --git a/tools/e2fsprogs/patches/004-darwin-compat.patch b/tools/e2fsprogs/patches/004-darwin-compat.patch
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..d84aa121ca540977c2973630a9ceb26a8a2e3a6c
|
|
--- /dev/null
|
|
+++ b/tools/e2fsprogs/patches/004-darwin-compat.patch
|
|
@@ -0,0 +1,22 @@
|
|
+--- a/lib/blkid/blkid_types.h.in
|
|
++++ b/lib/blkid/blkid_types.h.in
|
|
+@@ -9,6 +9,8 @@
|
|
+
|
|
+ @ASM_TYPES_HEADER@
|
|
+
|
|
++#include <stdint.h>
|
|
++
|
|
+ #ifndef HAVE___U8
|
|
+ #define HAVE___U8
|
|
+ #ifdef __U8_TYPEDEF
|
|
+--- a/lib/ext2fs/ext2_types.h.in
|
|
++++ b/lib/ext2fs/ext2_types.h.in
|
|
+@@ -9,6 +9,8 @@
|
|
+
|
|
+ @ASM_TYPES_HEADER@
|
|
+
|
|
++#include <stdint.h>
|
|
++
|
|
+ #ifndef HAVE___U8
|
|
+ #define HAVE___U8
|
|
+ #ifdef __U8_TYPEDEF
|
|
diff --git a/tools/e2fsprogs/patches/004-freebsd-compat.patch b/tools/e2fsprogs/patches/004-freebsd-compat.patch
|
|
deleted file mode 100644
|
|
index d102e1cd9c0966091da25fcbeb3d284c65ffc063..0000000000000000000000000000000000000000
|
|
--- a/tools/e2fsprogs/patches/004-freebsd-compat.patch
|
|
+++ /dev/null
|
|
@@ -1,12 +0,0 @@
|
|
---- a/lib/ext2fs/tdb.c
|
|
-+++ b/lib/ext2fs/tdb.c
|
|
-@@ -58,7 +58,9 @@ Last Changed Date: 2007-06-22 13:36:10 -
|
|
- #include <utime.h>
|
|
- #endif
|
|
- #include <sys/stat.h>
|
|
-+#ifndef __FreeBSD__
|
|
- #include <sys/file.h>
|
|
-+#endif
|
|
- #include <fcntl.h>
|
|
-
|
|
- #ifdef HAVE_SYS_MMAN_H
|
|
diff --git a/tools/e2fsprogs/patches/005-darwin-compat.patch b/tools/e2fsprogs/patches/005-darwin-compat.patch
|
|
deleted file mode 100644
|
|
index d84aa121ca540977c2973630a9ceb26a8a2e3a6c..0000000000000000000000000000000000000000
|
|
--- a/tools/e2fsprogs/patches/005-darwin-compat.patch
|
|
+++ /dev/null
|
|
@@ -1,22 +0,0 @@
|
|
---- a/lib/blkid/blkid_types.h.in
|
|
-+++ b/lib/blkid/blkid_types.h.in
|
|
-@@ -9,6 +9,8 @@
|
|
-
|
|
- @ASM_TYPES_HEADER@
|
|
-
|
|
-+#include <stdint.h>
|
|
-+
|
|
- #ifndef HAVE___U8
|
|
- #define HAVE___U8
|
|
- #ifdef __U8_TYPEDEF
|
|
---- a/lib/ext2fs/ext2_types.h.in
|
|
-+++ b/lib/ext2fs/ext2_types.h.in
|
|
-@@ -9,6 +9,8 @@
|
|
-
|
|
- @ASM_TYPES_HEADER@
|
|
-
|
|
-+#include <stdint.h>
|
|
-+
|
|
- #ifndef HAVE___U8
|
|
- #define HAVE___U8
|
|
- #ifdef __U8_TYPEDEF
|
|
diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch
|
|
deleted file mode 100644
|
|
index 11a7e180be8cb5c6e9d6809c08507afda02b7ff8..0000000000000000000000000000000000000000
|
|
--- a/tools/e2fsprogs/patches/010-old-libmagic.patch
|
|
+++ /dev/null
|
|
@@ -1,25 +0,0 @@
|
|
-From b482eb7af94885b6bbad9329e40702c958d5b448 Mon Sep 17 00:00:00 2001
|
|
-From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
-Date: Thu, 30 Jun 2016 19:53:03 +0200
|
|
-Subject: [PATCH] fix build problem with very old libmagic
|
|
-
|
|
-The libmagic shipped with RedHat 5 does not define
|
|
-MAGIC_NO_CHECK_ELF and MAGIC_NO_CHECK_COMPRESS. e2fsprogs should
|
|
-check for that otherwise the build will fail.
|
|
-
|
|
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
----
|
|
- lib/support/plausible.c | 2 +-
|
|
- 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
-
|
|
---- a/lib/support/plausible.c
|
|
-+++ b/lib/support/plausible.c
|
|
-@@ -258,7 +258,7 @@ int check_plausibility(const char *devic
|
|
- return 0;
|
|
- }
|
|
-
|
|
--#ifdef HAVE_MAGIC_H
|
|
-+#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_ELF) && defined(MAGIC_NO_CHECK_COMPRESS)
|
|
- if ((flags & CHECK_FS_EXIST) &&
|
|
- !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") &&
|
|
- magic_library_available()) {
|