gluon/patches/openwrt/0171-tools-bison-Update-to-3.0.5.patch
Linus Lüssing 0a150e97d4 openwrt: update tools to LEDE v17.01.6 to fix compile issues
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>
2019-04-20 06:04:16 +02:00

94 lines
3.7 KiB
Diff

From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Thu, 7 Jun 2018 19:21:12 +0200
Subject: tools/bison: Update to 3.0.5
Update bison to 3.0.5
Bugfix release
Remove 001-fix-macos-vasnprintf.patch as it is fixed upstream
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index af5737c552384f2cfec919d0379ccd64e7d5ccbe..68e06ae33b566df5c20388acc9b83d1cc6ab19f2 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -1,4 +1,4 @@
-#
+#
# Copyright (C) 2008-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bison
-PKG_VERSION:=3.0.4
+PKG_VERSION:=3.0.5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1
+PKG_HASH:=075cef2e814642e30e10e8155e93022e4a91ca38a65aa1d5467d4e969f97f338
HOST_BUILD_PARALLEL:=1
diff --git a/tools/bison/patches/001-fix-macos-vasnprintf.patch b/tools/bison/patches/001-fix-macos-vasnprintf.patch
deleted file mode 100644
index e41315d34ec7d2462035c27c344215688b18c4f6..0000000000000000000000000000000000000000
--- a/tools/bison/patches/001-fix-macos-vasnprintf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -4858,7 +4858,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
- #endif
- *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-+# if ! (((__GLIBC__ > 2 \
-+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-+ && !defined __UCLIBC__) \
-+ || (defined __APPLE__ && defined __MACH__) \
-+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
- fbp[1] = '%';
- fbp[2] = 'n';
- fbp[3] = '\0';
-@@ -4872,6 +4876,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
- in format strings in writable memory may crash the program
- (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
- in this situation. */
-+ /* macOS 10.13 High Sierra behaves like glibc with
-+ _FORTIFY_SOURCE=2, and older macOS releases
-+ presumably do not need %n. */
- /* On native Windows systems (such as mingw), we can avoid using
- %n because:
- - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
diff --git a/tools/bison/patches/100-fix-gets-removal.patch b/tools/bison/patches/100-fix-gets-removal.patch
index 20b18cf2e7cd722622fced5b0e7703807bef38ef..563c12040c594f9d9f46eed3af229e69f0201a26 100644
--- a/tools/bison/patches/100-fix-gets-removal.patch
+++ b/tools/bison/patches/100-fix-gets-removal.patch
@@ -1,6 +1,8 @@
+diff --git a/lib/stdio.in.h b/lib/stdio.in.h
+index ff7c9c8..f391832 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
-@@ -719,13 +719,6 @@
+@@ -739,14 +739,6 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
# endif
#endif
@@ -8,9 +10,10 @@
- so any use of gets warrants an unconditional warning; besides, C11
- removed it. */
-#undef gets
--#if HAVE_RAW_DECL_GETS
+-#if HAVE_RAW_DECL_GETS && !defined __cplusplus
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-#endif
-
-
+-
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+ struct obstack;
+ /* Grow an obstack with formatted output. Return the number of