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>
100 lines
3.5 KiB
Diff
100 lines
3.5 KiB
Diff
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Sun, 8 Nov 2015 20:40:03 +0000
|
|
Subject: tools/e2fsprogs: update to 1.42.13
|
|
|
|
Update e2fsprogs to 1.42.13.
|
|
Refresh and cleanup patches.
|
|
|
|
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
|
|
|
|
SVN-Revision: 47426
|
|
|
|
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
|
|
index 5632e1949d30aecd8a3fd0501c5e6e3684207986..0ecd9521f4e077b1354cb5eba230dbbf206b8bb5 100644
|
|
--- a/tools/e2fsprogs/Makefile
|
|
+++ b/tools/e2fsprogs/Makefile
|
|
@@ -1,5 +1,5 @@
|
|
#
|
|
-# Copyright (C) 2010-2013 OpenWrt.org
|
|
+# Copyright (C) 2010-2015 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
@@ -8,8 +8,8 @@
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=e2fsprogs
|
|
-PKG_VERSION:=1.42.8
|
|
-PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4
|
|
+PKG_VERSION:=1.42.13
|
|
+PKG_MD5SUM:=bc759fc62666786f5436e2075beb3265
|
|
PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
diff --git a/tools/e2fsprogs/patches/003-openbsd-compat.patch b/tools/e2fsprogs/patches/003-openbsd-compat.patch
|
|
index 1f7cdca0e56992d908f2bf863cf4b6bb687c4315..ded0ecad77fa9f382493556eeaeaf9fbee9fc97d 100644
|
|
--- a/tools/e2fsprogs/patches/003-openbsd-compat.patch
|
|
+++ b/tools/e2fsprogs/patches/003-openbsd-compat.patch
|
|
@@ -1,7 +1,6 @@
|
|
-diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/getsize.c
|
|
---- e2fsprogs-1.42.7.orig/lib/blkid/getsize.c Fri Nov 30 03:40:18 2012
|
|
-+++ e2fsprogs-1.42.7/lib/blkid/getsize.c Thu Mar 7 14:21:59 2013
|
|
-@@ -26,6 +26,9 @@
|
|
+--- a/lib/blkid/getsize.c
|
|
++++ b/lib/blkid/getsize.c
|
|
+@@ -25,6 +25,9 @@
|
|
#include <fcntl.h>
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
#include <sys/ioctl.h>
|
|
@@ -11,9 +10,8 @@ diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/g
|
|
#endif
|
|
#ifdef HAVE_LINUX_FD_H
|
|
#include <linux/fd.h>
|
|
-diff -Nur e2fsprogs-1.42.7.orig/lib/quota/mkquota.c e2fsprogs-1.42.7/lib/quota/mkquota.c
|
|
---- e2fsprogs-1.42.7.orig/lib/quota/mkquota.c Wed Jan 2 01:47:20 2013
|
|
-+++ e2fsprogs-1.42.7/lib/quota/mkquota.c Thu Mar 7 14:21:59 2013
|
|
+--- a/lib/quota/mkquota.c
|
|
++++ b/lib/quota/mkquota.c
|
|
@@ -8,6 +8,7 @@
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
diff --git a/tools/e2fsprogs/patches/004-freebsd-compat.patch b/tools/e2fsprogs/patches/004-freebsd-compat.patch
|
|
index 5eff49999e2e68f50e5fa05583a2a7158f0d0de9..c6435d49192bfa1f645f94e69baa62ccf1658d81 100644
|
|
--- a/tools/e2fsprogs/patches/004-freebsd-compat.patch
|
|
+++ b/tools/e2fsprogs/patches/004-freebsd-compat.patch
|
|
@@ -1,6 +1,5 @@
|
|
-diff -Nur e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c e2fsprogs-1.42.7/lib/ext2fs/tdb.c
|
|
---- e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c 2012-07-06 15:37:27.000000000 +0200
|
|
-+++ e2fsprogs-1.42.7/lib/ext2fs/tdb.c 2013-03-07 14:54:59.000000000 +0100
|
|
+--- a/lib/ext2fs/tdb.c
|
|
++++ b/lib/ext2fs/tdb.c
|
|
@@ -56,7 +56,9 @@
|
|
#include <utime.h>
|
|
#endif
|
|
diff --git a/tools/e2fsprogs/patches/005-darwin-compat.patch b/tools/e2fsprogs/patches/005-darwin-compat.patch
|
|
index bc81d8638a5f294bb520f54ad518c3aecda0c3bd..c5d0e28c555f215b1953861a7e9ba8e881ed2e24 100644
|
|
--- a/tools/e2fsprogs/patches/005-darwin-compat.patch
|
|
+++ b/tools/e2fsprogs/patches/005-darwin-compat.patch
|
|
@@ -6,9 +6,9 @@
|
|
|
|
+#include <stdint.h>
|
|
+
|
|
+ #ifndef HAVE___U8
|
|
+ #define HAVE___U8
|
|
#ifdef __U8_TYPEDEF
|
|
- typedef __U8_TYPEDEF __u8;
|
|
- #else
|
|
--- a/lib/ext2fs/ext2_types.h.in
|
|
+++ b/lib/ext2fs/ext2_types.h.in
|
|
@@ -9,6 +9,8 @@
|
|
@@ -17,6 +17,7 @@
|
|
|
|
+#include <stdint.h>
|
|
+
|
|
+ #ifndef HAVE___U8
|
|
+ #define HAVE___U8
|
|
#ifdef __U8_TYPEDEF
|
|
- typedef __U8_TYPEDEF __u8;
|
|
- #else
|
|
+
|