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>
82 lines
3.7 KiB
Diff
82 lines
3.7 KiB
Diff
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Fri, 11 Dec 2015 19:21:43 +0000
|
|
Subject: tools/squashfs4: refresh patches
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
SVN-Revision: 47869
|
|
|
|
diff --git a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
|
|
index d6063969d274278df08046a5c73ee38aea1bd404..2fbd9548590ea17a4e14d29ddf1b47685a22caa9 100644
|
|
--- a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
|
|
+++ b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
|
|
@@ -637,7 +637,7 @@
|
|
}
|
|
|
|
name = argv[1];
|
|
-@@ -76,190 +73,50 @@ static int xz_options(char *argv[], int
|
|
+@@ -76,190 +73,50 @@ static int xz_options(char *argv[], int
|
|
}
|
|
if(bcj[i].name == NULL) {
|
|
fprintf(stderr, "xz: -Xbcj unrecognised "
|
|
@@ -864,7 +864,7 @@
|
|
SQUASHFS_METADATA_SIZE;
|
|
|
|
filter[0].filter[0].id = LZMA_FILTER_LZMA2;
|
|
-@@ -323,14 +181,25 @@ static int xz_compress(void *strm, void
|
|
+@@ -323,14 +181,25 @@ static int xz_compress(void *strm, void
|
|
lzma_ret res = 0;
|
|
struct xz_stream *stream = strm;
|
|
struct filter *selected = NULL;
|
|
diff --git a/tools/squashfs4/patches/180-openbsd_compat.patch b/tools/squashfs4/patches/180-openbsd_compat.patch
|
|
index 6d7a857a05ab140753c6dc6fd52cadfb9a3f9ef8..b9c1b5925d8526454a6bed5139bf6301a5896c02 100644
|
|
--- a/tools/squashfs4/patches/180-openbsd_compat.patch
|
|
+++ b/tools/squashfs4/patches/180-openbsd_compat.patch
|
|
@@ -1,6 +1,5 @@
|
|
-diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tools/mksquashfs.c
|
|
---- squashfs4.2.orig/squashfs-tools/mksquashfs.c Tue Mar 5 16:20:49 2013
|
|
-+++ squashfs4.2/squashfs-tools/mksquashfs.c Tue Mar 5 16:25:10 2013
|
|
+--- a/squashfs-tools/mksquashfs.c
|
|
++++ b/squashfs-tools/mksquashfs.c
|
|
@@ -32,6 +32,9 @@
|
|
#include <stdio.h>
|
|
#include <stddef.h>
|
|
@@ -11,9 +10,8 @@ diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tool
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
-diff -Nur squashfs4.2.orig/squashfs-tools/unsquashfs.h squashfs4.2/squashfs-tools/unsquashfs.h
|
|
---- squashfs4.2.orig/squashfs-tools/unsquashfs.h Tue Mar 5 16:20:49 2013
|
|
-+++ squashfs4.2/squashfs-tools/unsquashfs.h Tue Mar 5 16:25:57 2013
|
|
+--- a/squashfs-tools/unsquashfs.h
|
|
++++ b/squashfs-tools/unsquashfs.h
|
|
@@ -25,6 +25,9 @@
|
|
#define TRUE 1
|
|
#define FALSE 0
|
|
diff --git a/tools/squashfs4/patches/190-no_nonstatic_inline.patch b/tools/squashfs4/patches/190-no_nonstatic_inline.patch
|
|
index 7b5808afab5de2a00e1b862f7405cb60f51c88b1..27ebc6a2639be8d3b303e34ab73e224f394d9b2d 100644
|
|
--- a/tools/squashfs4/patches/190-no_nonstatic_inline.patch
|
|
+++ b/tools/squashfs4/patches/190-no_nonstatic_inline.patch
|
|
@@ -1,6 +1,6 @@
|
|
--- a/squashfs-tools/mksquashfs.c
|
|
+++ b/squashfs-tools/mksquashfs.c
|
|
-@@ -735,13 +735,13 @@ void cache_block_put(struct file_buffer
|
|
+@@ -735,13 +735,13 @@ void cache_block_put(struct file_buffer
|
|
+ (((char *)A) - data_cache)))
|
|
|
|
|
|
diff --git a/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch b/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
|
|
index 7ac1765eed22a371f8584e4a3968941eb923fa89..5cec51f7b7ea716b76fdb63db307728728f21f44 100644
|
|
--- a/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
|
|
+++ b/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
|
|
@@ -1,7 +1,5 @@
|
|
-Index: squashfs4.2/squashfs-tools/mksquashfs.c
|
|
-===================================================================
|
|
---- squashfs4.2.orig/squashfs-tools/mksquashfs.c
|
|
-+++ squashfs4.2/squashfs-tools/mksquashfs.c
|
|
+--- a/squashfs-tools/mksquashfs.c
|
|
++++ b/squashfs-tools/mksquashfs.c
|
|
@@ -175,6 +175,9 @@ unsigned int cache_bytes = 0, cache_size
|
|
/* inode lookup table */
|
|
squashfs_inode *inode_lookup_table = NULL;
|