Merge pull request #10212 from lovehackintosh/bump-tools

tools: update version
2025-04-16 04:13:31 +00:00 · 2022-10-01 19:06:50 +08:00 · 2022-10-01 19:06:50 +08:00 · f1df38e318
commit f1df38e318
parent 56bf33b686 5fcaadd8ce
41 changed files with 365 additions and 389 deletions
--- a/include/meson.mk
+++ b/include/meson.mk
@ -65,6 +65,8 @@ define Meson/CreateNativeFile
 		-e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \
 		-e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \
 		-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
+		-e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
+		-e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \
 		-e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \
@ -81,6 +83,8 @@ define Meson/CreateCrossFile
 		-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
 		-e "s|@NM@|$(TARGET_NM)|" \
 		-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
+		-e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
+		-e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \
 		-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gdb
-PKG_VERSION:=11.2
+PKG_VERSION:=12.1
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gdb
-PKG_HASH:=1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32
+PKG_HASH:=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed
 GDB_DIR:=$(PKG_NAME)-$(PKG_VERSION)

 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GDB_DIR)
@ -33,12 +33,12 @@ HOST_CONFIGURE_ARGS = \
 	--with-gmp=$(TOPDIR)/staging_dir/host \
 	--with-mpfr=$(TOPDIR)/staging_dir/host \
 	--with-mpc=$(TOPDIR)/staging_dir/host \
+	--with-expat=$(TOPDIR)/staging_dir/host \
 	--disable-werror \
 	--without-uiout \
 	--enable-tui --disable-gdbtk --without-x \
 	--without-included-gettext \
 	--enable-threads \
-	--with-expat \
 	--disable-unit-tests \
 	--disable-ubsan \
 	--disable-binutils \
--- a/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch
+++ b/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch
@ -1,6 +1,6 @@
 --- a/gdbserver/configure
 +++ b/gdbserver/configure
-@@ -2661,7 +2661,7 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2664,7 +2664,7 @@ $as_echo "$as_me: error: \`$ac_var' was
       ac_cache_corrupted=: ;;
     ,);;
     *)
--- a/tools/Makefile
+++ b/tools/Makefile
@ -71,6 +71,7 @@ $(curdir)/mpfr/compile := $(curdir)/gmp/compile
 $(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/padjffs2/compile := $(curdir)/findutils/compile
 $(curdir)/patchelf/compile := $(curdir)/libtool/compile
+$(curdir)/pkgconf/compile := $(curdir)/meson/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile
 $(curdir)/sdcc/compile := $(curdir)/bison/compile
 $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
@ -92,7 +93,7 @@ else
 endif

 ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
-$(foreach tool, $(filter-out xz zstd patch pkgconf libressl ninja cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile))
+$(foreach tool, $(filter-out xz zstd pkgconf patch ninja meson libressl cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile))
 tools-y += ccache
 $(curdir)/ccache/compile := $(curdir)/zstd/compile
 endif
--- a/tools/bc/Makefile
+++ b/tools/bc/Makefile
@ -7,16 +7,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bc
-PKG_VERSION:=1.06.95
+PKG_VERSION:=1.07

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alpha.gnu.org/gnu/bc \
-	https://gnualpha.uib.no/bc/ \
-	https://mirrors.fe.up.pt/pub/gnu-alpha/bc/ \
-	https://www.nic.funet.fi/pub/gnu/alpha/gnu/bc/
-PKG_HASH:=7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/bc
+PKG_HASH:=55cf1fc33a728d7c3d386cc7b0cb556eb5bacf8e0cb5a3fcca7f109fc61205ad

 PKG_FIXUP := autoreconf
+PKG_CPE_ID:=cpe:/a:gnu:bc

 include $(INCLUDE_DIR)/host-build.mk

--- a/tools/bc/patches/001-no_doc.patch
+++ b/tools/bc/patches/001-no_doc.patch
@ -1,6 +1,5 @@
-diff -urN bc-1.06.95/Makefile.am bc-1.06.95.new/Makefile.am
--- bc-1.06.95/Makefile.am	2005-05-27 01:05:41.000000000 +0100
-+++ bc-1.06.95.new/Makefile.am	2013-07-09 09:33:31.521490710 +0100
+--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
@ -8,16 +7,15 @@ diff -urN bc-1.06.95/Makefile.am bc-1.06.95.new/Makefile.am
 +SUBDIRS = lib bc dc
 
 MAINTAINERCLEANFILES =  aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
-diff -urN bc-1.06.95/Makefile.in bc-1.06.95.new/Makefile.in
--- bc-1.06.95/Makefile.in	2006-09-05 03:39:30.000000000 +0100
-+++ bc-1.06.95.new/Makefile.in	2013-07-09 09:33:28.565490767 +0100
-@@ -149,7 +149,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+ 			stamp-h $(distdir).tar.gz h/number.h depcomp missing \
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -288,7 +288,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = lib bc dc doc
 +SUBDIRS = lib bc dc
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
- 
+ 			stamp-h $(distdir).tar.gz h/number.h depcomp missing \
+ 			bc/libmath.h
--- a/tools/bc/patches/002-fix-libmath.patch
+++ b/tools/bc/patches/002-fix-libmath.patch
@ -0,0 +1,32 @@
+--- a/bc/fix-libmath_h
+++ b/bc/fix-libmath_h
+@@ -1,9 +1,9 @@
+-ed libmath.h <<EOS-EOS
+-1,1s/^/{"/
+-1,\$s/\$/",/
+-2,\$s/^/"/
+-\$,\$d
+-\$,\$s/,\$/,0}/
+-w
+-q
+-EOS-EOS
+#! /bin/bash
+sed -e '1   s/^/{"/' \
+    -e     's/$/",/' \
+    -e '2,$ s/^/"/'  \
+    -e   '$ d'       \
+    -i libmath.h
+
+sed -e '$ s/$/0}/' \
+    -i libmath.h
+--- a/configure
+++ b/configure
+@@ -5288,7 +5288,7 @@ case $bcle-$bcrl-$LEX in
+    ?-?-flex)
+ 	LEX="flex -I -8" ;;
+    ?-y-*)
+-	as_fn_error $? "readline works only with flex." "$LINENO" 5 ;;
+	: ;; # as_fn_error $? "readline works only with flex." "$LINENO" 5 ;;
+ esac
+ 
+ case $LEX-`uname -s` in
--- a/tools/bc/patches/003-bc-fix-hang.patch
+++ b/tools/bc/patches/003-bc-fix-hang.patch
@ -0,0 +1,11 @@
+--- a/bc/execute.c
+++ b/bc/execute.c
+@@ -595,7 +595,7 @@ input_char (void)
+   if (in_ch == '.' || in_ch == '+' || in_ch == '-')
+     return (in_ch);
+   if (in_ch <= ' ')
+-    return (' ');
+    return (':');
+   
+   return (':');
+ }
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@ -8,13 +8,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk

 PKG_NAME:=ccache
-PKG_VERSION:=4.5.1
+PKG_VERSION:=4.6.3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
-PKG_HASH:=51186ebe0326365f4e6131e1caa8911de7da4aa6718efc00680322d63a759517
-
-HOST_BUILD_PARALLEL:=1
+PKG_HASH:=1e3a251bb112632553b8255a78661fe526c3a16598496d51128c32b218fd8b22

 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@ -1,6 +1,6 @@
 --- a/src/ccache.cpp
 +++ b/src/ccache.cpp
-@@ -1633,6 +1633,7 @@ calculate_result_and_manifest_key(Contex
+@@ -1756,6 +1756,7 @@ calculate_result_and_manifest_key(Contex
                              "CPLUS_INCLUDE_PATH",
                              "OBJC_INCLUDE_PATH",
                              "OBJCPLUS_INCLUDE_PATH", // clang
--- a/tools/dosfstools/Makefile
+++ b/tools/dosfstools/Makefile
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dosfstools
 PKG_CPE_ID:=cpe:/a:dosfstools_project:dosfstools
-PKG_VERSION:=4.1
+PKG_VERSION:=4.2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \
 		http://fossies.org/linux/misc
-PKG_HASH:=e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173
+PKG_HASH:=ba7c716ff9b8208a3bba5094a77584a7dc814141de09ab4ce1ae9b84bbcd7844

 HOST_FIXUP:=autoreconf

--- a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch
+++ b/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch
@ -1,27 +0,0 @@
-From 1c6c135ee15e449c1bf2e76d5307f83a3a1d7425 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Tue, 11 Oct 2016 12:07:48 +0200
-Subject: [PATCH] Switch to AC_CHECK_LIB for iconv library linking.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-AC_SEARCH_LIB doesn't work properly for openwrt/lede when building dosfstools
-as a package.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -59,7 +59,7 @@ if test "x$with_udev" != "xno"; then
- 		  [true])
- fi
- 
-AC_SEARCH_LIBS(iconv_open, iconv)
-+AC_CHECK_LIB(iconv, iconv_open)
- 
- # xxd (distributed with vim) is used in the testsuite
- AC_CHECK_PROG([XXD_FOUND], [xxd], [yes])
--- a/tools/dosfstools/patches/source-date-epoch.patch
+++ b/tools/dosfstools/patches/source-date-epoch.patch
@ -0,0 +1,157 @@
+From 8da7bc93315cb0c32ad868f17808468b81fa76ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Wed, 5 Dec 2018 19:52:51 +0100
+Subject: [PATCH] Honor the SOURCE_DATE_EPOCH variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Implement the SOURCE_DATE_EPOCH specification[1] for reproducible
+builds. If SOURCE_DATE_EPOCH is set, use it as timestamp instead of the
+current time.
+
+[1] https://reproducible-builds.org/specs/source-date-epoch/
+
+Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
+---
+ src/boot.c     | 23 +++++++++++++++++++++--
+ src/common.c   | 18 ++++++++++++++++--
+ src/mkfs.fat.c | 19 ++++++++++++++++---
+ 3 files changed, 53 insertions(+), 7 deletions(-)
+
+diff --git a/src/boot.c b/src/boot.c
+index 4de450d..8f78e1c 100644
+--- a/src/boot.c
+++ b/src/boot.c
+@@ -33,6 +33,8 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <time.h>
+#include <errno.h>
+#include <ctype.h>
+ 
+ #include "common.h"
+ #include "fsck.fat.h"
+@@ -672,6 +674,7 @@ void write_volume_label(DOS_FS * fs, char *label)
+ {
+     time_t now;
+     struct tm *mtime;
+    char *source_date_epoch = NULL;
+     off_t offset;
+     int created;
+     DIR_ENT de;
+@@ -687,8 +690,24 @@ void write_volume_label(DOS_FS * fs, char *label)
+     if (de.name[0] == 0xe5)
+ 	de.name[0] = 0x05;
+ 
+-    now = time(NULL);
+-    mtime = (now != (time_t)-1) ? localtime(&now) : NULL;
+    source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+    if (source_date_epoch) {
+        char *tmp = NULL;
+        long long conversion = 0;
+        errno = 0;
+        conversion = strtoll(source_date_epoch, &tmp, 10);
+        now = conversion;
+        if (!isdigit((unsigned char)*source_date_epoch) || *tmp != '\0'
+                || errno != 0 || (long long)now != conversion) {
+            die("SOURCE_DATE_EPOCH is too big or contains non-digits: \"%s\"",
+                source_date_epoch);
+        }
+        mtime = gmtime(&now);
+    } else {
+        now = time(NULL);
+        mtime = (now != (time_t)-1) ? localtime(&now) : NULL;
+    }
+
+     if (mtime && mtime->tm_year >= 80 && mtime->tm_year <= 207) {
+ 	de.time = htole16((unsigned short)((mtime->tm_sec >> 1) +
+ 					   (mtime->tm_min << 5) +
+diff --git a/src/common.c b/src/common.c
+index 6a2e396..4f1afcb 100644
+--- a/src/common.c
+++ b/src/common.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <errno.h>
+#include <ctype.h>
+ #include <wctype.h>
+ #include <termios.h>
+ #include <sys/time.h>
+@@ -298,8 +299,21 @@ void check_atari(void)
+ uint32_t generate_volume_id(void)
+ {
+     struct timeval now;
+-
+-    if (gettimeofday(&now, NULL) != 0 || now.tv_sec == (time_t)-1 || now.tv_sec < 0) {
+    char *source_date_epoch = NULL;
+
+    source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+    if (source_date_epoch) {
+        char *tmp = NULL;
+        long long conversion = 0;
+        errno = 0;
+        conversion = strtoll(source_date_epoch, &tmp, 10);
+        if (!isdigit((unsigned char)*source_date_epoch) || *tmp != '\0'
+                || errno != 0) {
+            die("SOURCE_DATE_EPOCH is too big or contains non-digits: \"%s\"",
+                source_date_epoch);
+        }
+        return (uint32_t)conversion;
+    } else if (gettimeofday(&now, NULL) != 0 || now.tv_sec == (time_t)-1 || now.tv_sec < 0) {
+         srand(getpid());
+         /* rand() returns int from [0,RAND_MAX], therefore only 31 bits */
+         return (((uint32_t)(rand() & 0xFFFF)) << 16) | ((uint32_t)(rand() & 0xFFFF));
+diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
+index 37fc8ff..1948635 100644
+--- a/src/mkfs.fat.c
+++ b/src/mkfs.fat.c
+@@ -1074,7 +1074,7 @@ static void setup_tables(void)
+         }
+ 
+         /* If is not available then generate random 32 bit disk signature */
+-        if (invariant)
+        if (invariant || getenv("SOURCE_DATE_EPOCH"))
+             disk_sig = volume_id;
+         else if (!disk_sig)
+             disk_sig = generate_volume_id();
+@@ -1287,7 +1287,7 @@ static void setup_tables(void)
+ 	    de->name[0] = 0x05;
+ 	de->attr = ATTR_VOLUME;
+ 	if (create_time != (time_t)-1) {
+-	    if (!invariant)
+	    if (!invariant && !getenv("SOURCE_DATE_EPOCH"))
+ 		ctime = localtime(&create_time);
+ 	    else
+ 		ctime = gmtime(&create_time);
+@@ -1477,6 +1477,7 @@ int main(int argc, char **argv)
+     int blocks_specified = 0;
+     struct timeval create_timeval;
+     long long conversion;
+    char *source_date_epoch = NULL;
+ 
+     enum {OPT_HELP=1000, OPT_INVARIANT, OPT_MBR, OPT_VARIANT, OPT_CODEPAGE, OPT_OFFSET};
+     const struct option long_options[] = {
+@@ -1497,8 +1498,20 @@ int main(int argc, char **argv)
+ 	    program_name = p + 1;
+     }
+ 
+-    if (gettimeofday(&create_timeval, NULL) == 0 && create_timeval.tv_sec != (time_t)-1)
+    source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+    if (source_date_epoch) {
+        errno = 0;
+        conversion = strtoll(source_date_epoch, &tmp, 10);
+        create_time = conversion;
+        if (!isdigit((unsigned char)*source_date_epoch) || *tmp != '\0'
+                || errno != 0 || (long long)create_time != conversion) {
+            die("SOURCE_DATE_EPOCH is too big or contains non-digits: \"%s\"",
+                source_date_epoch);
+        }
+    } else if (gettimeofday(&create_timeval, NULL) == 0 && create_timeval.tv_sec != (time_t)-1) {
+         create_time = create_timeval.tv_sec;
+    }
+
+     volume_id = generate_volume_id();
+     check_atari();
+ 
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=e2fsprogs
 PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
-PKG_VERSION:=1.46.4
-PKG_HASH:=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713
+PKG_VERSION:=1.46.5
+PKG_HASH:=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--- a/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
+++ b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
@ -1,6 +1,6 @@
 --- a/e2fsck/e2fsck.h
 +++ b/e2fsck/e2fsck.h
-@@ -74,7 +74,7 @@
+@@ -81,7 +81,7 @@
  * Exit codes used by fsck-type programs
  */
 #define FSCK_OK          0	/* No errors */
--- a/tools/expat/Makefile
+++ b/tools/expat/Makefile
@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=expat
 PKG_CPE_ID:=cpe:/a:libexpat:expat
-PKG_VERSION:=2.4.6
+PKG_VERSION:=2.4.9

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=ce317706b07cae150f90cddd4253f5b4fba929607488af5ac47bf2bc08e31f09
+PKG_HASH:=7f44d1469b110773a94b0d5abeeeffaef79f8bd6406b07e52394bcf48126437a
 PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))

 HOST_BUILD_PARALLEL:=1
--- a/tools/fakeroot/Makefile
+++ b/tools/fakeroot/Makefile
@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=fakeroot
-PKG_VERSION:=1.27
+PKG_VERSION:=1.29
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot
-PKG_HASH:=3c45eb2d1802a2762069e2e9d21bdd6fb533592bc0cda74c9aff066ab01caddc
+PKG_HASH:=8fbbafb780c9173e3ace4a04afbc1d900f337f3216883939f5c7db3431be7c20
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_FIXUP:=autoreconf
--- a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch
+++ b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch
@ -21,7 +21,7 @@ Error relocating openwrt/staging_dir/host/lib/libfakeroot.so: SEND_GET_XATTR: sy
 #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
 #endif
 
-@@ -136,8 +138,9 @@
+@@ -142,8 +144,9 @@
 
 /* 10.10 uses id_t in getpriority/setpriority calls, so pretend
    id_t is used everywhere, just happens to be int on some OSes */
--- a/tools/fakeroot/patches/600-macOS.patch
+++ b/tools/fakeroot/patches/600-macOS.patch
@ -11,3 +11,46 @@
 static struct sockaddr *get_addr(void)
 {
   static struct sockaddr_in addr = { 0, 0, { 0 } };
+--- a/libfakeroot_inode64.c
+++ b/libfakeroot_inode64.c
+@@ -25,7 +25,7 @@
+ #include "config.h"
+ #include "communicate.h"
+ 
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
+ 
+ #include <stdio.h>
+ #include <spawn.h>
+--- a/wrapfunc.inp
+++ b/wrapfunc.inp
+@@ -48,9 +48,11 @@ getattrlist$UNIX2003;int;(const char *pa
+ #endif
+ #endif
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if !__DARWIN_ONLY_64_BIT_INO_T
+ lstat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf)
+ stat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf)
+ fstat$INODE64;int;(int fd, struct stat *buf);(fd, buf)
+#endif
+ posix_spawn;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp)
+ posix_spawnp;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp)
+ #endif
+@@ -229,7 +231,7 @@ facl;int;(int fd, int cmd, int cnt, void
+ #ifdef HAVE_FTS_READ
+ fts_read;FTSENT *;(FTS *ftsp);(ftsp)
+ #ifdef __APPLE__
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
+ fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp)
+ #endif
+ #endif /* ifdef __APPLE__ */
+@@ -237,7 +239,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f
+ #ifdef HAVE_FTS_CHILDREN
+ fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
+ #ifdef __APPLE__
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
+ fts_children$INODE64;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
+ #endif
+ #endif /* ifdef __APPLE__ */
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@ -11,9 +11,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
-PKG_SOURCE_DATE:=2022-07-28
-PKG_SOURCE_VERSION:=2483fe782e0d406b65eaa73b39fc27afabd8a9ea
-PKG_MIRROR_HASH:=140b84b33cdae1520304cd6798604a51d2f4281b828808a5913d0b2d4b1f551f
+PKG_SOURCE_DATE:=2022-09-12
+PKG_SOURCE_VERSION:=0c92b20ad488a4fb5fb290f6d1b893df45761275
+PKG_MIRROR_HASH:=2cfd36e749b51d539cffe22c77a4c3ccd3bac2eca482affe23e1cab539e8bd16

 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
--- a/tools/meson/Makefile
+++ b/tools/meson/Makefile
@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=meson
-PKG_VERSION:=0.61.2
+PKG_VERSION:=0.63.1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)
-PKG_HASH:=0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889
+PKG_HASH:=06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9

 PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
 PKG_LICENSE:=Apache-2.0
--- a/tools/meson/files/openwrt-cross.txt.in
+++ b/tools/meson/files/openwrt-cross.txt.in
@ -6,6 +6,7 @@ strip = '@STRIP@'
 nm = '@NM@'
 pkgconfig = '@PKGCONFIG@'
 cmake = '@CMAKE@'
+python = '@PYTHON@'

 [built-in options]
 c_args = [@CFLAGS@]
--- a/tools/meson/files/openwrt-native.txt.in
+++ b/tools/meson/files/openwrt-native.txt.in
@ -3,6 +3,7 @@ c = [@CC@]
 cpp = [@CXX@]
 pkgconfig = '@PKGCONFIG@'
 cmake = '@CMAKE@'
+python = '@PYTHON@'

 [built-in options]
 c_args = [@CFLAGS@]
--- a/tools/mklibs/Makefile
+++ b/tools/mklibs/Makefile
@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=mklibs
-PKG_VERSION:=0.1.44
+PKG_VERSION:=0.1.45

 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@DEBIAN/pool/main/m/mklibs/
-PKG_HASH:=3af0b6bd35e5b6fc58d8b68827fbae2ff6b7e20dd2b238ccb9b49d84722066c2
+PKG_HASH:=dd92a904b3942566f713fe536cd77dd1a5cfc62243c0e0bc6bb5d866e37422f3

 HOST_FIXUP:=autoreconf

--- a/tools/mklibs/patches/002-disable_symbol_checks.patch
+++ b/tools/mklibs/patches/002-disable_symbol_checks.patch
@ -5,7 +5,7 @@
         for name in unresolved:
             if not needed_symbols[name].weak:
 -                raise Exception("Unresolvable symbol %s" % name)
-+                print "WARNING: Unresolvable symbol %s" % name
+                print("WARNING: Unresolvable symbol %s" % name)
         break
 
     previous_pass_unresolved = unresolved
@ -14,7 +14,7 @@
         if not name in symbol_provider:
             if not needed_symbols[name].weak:
 -                raise Exception("No library provides non-weak %s" % name)
-+                print "WARNING: Unresolvable symbol %s" % name
+                print("WARNING: Unresolvable symbol %s" % name)
         else:
             lib = symbol_provider[name]
             library_symbols_used[lib].add(library_symbols[lib][name])
--- a/tools/mklibs/patches/003-no_copy.patch
+++ b/tools/mklibs/patches/003-no_copy.patch
@ -32,11 +32,11 @@
 -                      dest_path + "/" + so_file_name + "-so",
 -                      dest_path + "/" + so_file_name + "-so-stripped")
             ## DEBUG
-             debug(DEBUG_VERBOSE, so_file, "\t", `os.stat(so_file)[ST_SIZE]`)
+             debug(DEBUG_VERBOSE, so_file, "\t", str(os.stat(so_file)[ST_SIZE]))
             debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so", "\t",
-                   `os.stat(dest_path + "/" + so_file_name + "-so")[ST_SIZE]`)
+                   str(os.stat(dest_path + "/" + so_file_name + "-so")[ST_SIZE]))
 -            debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so-stripped",
-                  "\t", `os.stat(dest_path + "/" + so_file_name + "-so-stripped")[ST_SIZE]`)
+-                  "\t", str(os.stat(dest_path + "/" + so_file_name + "-so-stripped")[ST_SIZE]))
 
 # Finalising libs and cleaning up
 -for lib in regexpfilter(os.listdir(dest_path), "(.*)-so-stripped$"):
--- a/tools/mklibs/patches/005-duplicate_syms.patch
+++ b/tools/mklibs/patches/005-duplicate_syms.patch
@ -23,7 +23,7 @@
     for name in needed_symbols:
 -        if not name in symbol_provider:
 -            if not needed_symbols[name].weak:
-                print "WARNING: Unresolvable symbol %s" % name
+-                print("WARNING: Unresolvable symbol %s" % name)
 -        else:
 -            lib = symbol_provider[name]
 -            library_symbols_used[lib].add(library_symbols[lib][name])
--- a/tools/mklibs/patches/006-uclibc_init.patch
+++ b/tools/mklibs/patches/006-uclibc_init.patch
@ -1,14 +0,0 @@
--- a/src/mklibs
-+++ b/src/mklibs
-@@ -604,6 +604,11 @@ while 1:
-                 extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
-                 symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
- 
-+            if soname in ("libc.so.0"):
-+                symbols.add(ProvidedSymbol('__uClibc_init', None, None, True))
-+                symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True))
-+                extra_flags.append("-Wl,-init,__uClibc_init")
-+
-             map_file = find_pic_map(library)
-             if map_file:
-                 extra_flags.append("-Wl,--version-script=" + map_file)
--- a/tools/mklibs/patches/007-gc_sections.patch
+++ b/tools/mklibs/patches/007-gc_sections.patch
@ -1,6 +1,6 @@
 --- a/src/mklibs
 +++ b/src/mklibs
-@@ -616,7 +616,7 @@ while 1:
+@@ -611,7 +611,7 @@ while 1:
             # compile in only used symbols
             cmd = []
             cmd.extend(gcc_options)
--- a/tools/mklibs/patches/008-uclibc_libgcc_link.patch
+++ b/tools/mklibs/patches/008-uclibc_libgcc_link.patch
@ -22,7 +22,7 @@
 
             symbols.update(library_symbols_used[library])
 
-@@ -623,9 +621,10 @@ while 1:
+@@ -618,9 +616,10 @@ while 1:
             cmd.append(pic_file)
             cmd.extend(extra_post_obj)
             cmd.extend(extra_flags)
--- a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
+++ b/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
@ -1,63 +0,0 @@
--- a/src/mklibs
-+++ b/src/mklibs
-@@ -173,9 +173,10 @@ def undefined_symbols(obj):
-     return result
- 
- class ProvidedSymbol(Symbol):
-    def __init__(self, name, version, library, default_version):
-+    def __init__(self, name, version, library, default_version, weak):
-         super(ProvidedSymbol, self).__init__(name, version, library)
-         self.default_version = default_version
-+        self.weak = weak
- 
-     def base_names(self):
-         ret = []
-@@ -216,11 +217,15 @@ def provided_symbols(obj):
-         if version_string.lower() not in ('base', 'none'):
-             version = version_string
- 
-+        weak = False
-+        if weak_string.lower() == 'true':
-+            weak = True
-+
-         default_version = False
-         if default_version_string.lower() == 'true':
-             default_version = True
- 
-        result.append(ProvidedSymbol(name, version, library, default_version))
-+        result.append(ProvidedSymbol(name, version, library, default_version, weak))
- 
-     return result
-     
-@@ -509,6 +514,9 @@ while 1:
-             debug(DEBUG_SPAM, "present_symbols adding %s" % symbol)
-             names = symbol.base_names()
-             for name in names:
-+                if name in present_symbols:
-+                    if symbol.library != present_symbols[name].library:
-+                        needed_symbols[name] = UndefinedSymbol(name, True, symbol.version, symbol.library)
-                 present_symbols[name] = symbol
- 
-     # are we finished?
-@@ -600,12 +608,16 @@ while 1:
-                 # may segfault in ptmalloc_init due to undefined weak reference
-                 extra_pre_obj.append(sysroot + libc_extras_dir + "/soinit.o")
-                 extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
-                symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
-+                symbols.add(ProvidedSymbol('__dso_handle', None, None, True, True))
- 
-            if soname in ("libc.so.0"):
-                symbols.add(ProvidedSymbol('__uClibc_init', None, None, True))
-                symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True))
-                extra_flags.append("-Wl,-init,__uClibc_init")
-+            if soname == "libc.so.0":
-+                symbols.add(ProvidedSymbol('__uClibc_init', None, None, True, True))
-+                symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True, True))
-+                extra_pre_obj.append("-Wl,-init,__uClibc_init")
-+
-+            if soname == "libpthread.so.0":
-+                symbols.add(ProvidedSymbol('__pthread_initialize_minimal_internal', None, None, True, True))
-+                extra_flags.append("-Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal")
- 
-             map_file = find_pic_map(library)
-             if map_file:
--- a/tools/mklibs/patches/011-remove_multiarch.patch
+++ b/tools/mklibs/patches/011-remove_multiarch.patch
@ -1,6 +1,6 @@
 --- a/src/mklibs
 +++ b/src/mklibs
-@@ -274,6 +274,7 @@ def extract_soname(so_file):
+@@ -269,6 +269,7 @@ def extract_soname(so_file):
     return ""
 
 def multiarch(paths):
--- a/tools/mklibs/patches/100-apply-2to3.patch
+++ b/tools/mklibs/patches/100-apply-2to3.patch
@ -1,10 +1,10 @@
 --- a/src/mklibs
 +++ b/src/mklibs
-@@ -57,18 +57,18 @@ debuglevel = DEBUG_NORMAL
+@@ -57,17 +57,17 @@ debuglevel = DEBUG_NORMAL
 
 def debug(level, *msg):
     if debuglevel >= level:
-        print string.join(msg)
+-        print(string.join(msg))
 +        print(' '.join(msg))
 
 # return a list of lines of output of the command
@ -15,82 +15,22 @@
     output = pipe.read().strip()
     status = pipe.close() 
     if status is not None and os.WEXITSTATUS(status) != 0:
-        print "Command failed with status", os.WEXITSTATUS(status),  ":", \
-               command, string.join(args)
-	print "With output:", output
-+        print("Command failed with status", os.WEXITSTATUS(status),  ":", \
+         print("Command failed with status", os.WEXITSTATUS(status),  ":", \
+-               command, string.join(args))
 +               command, ' '.join(args))
-+        print("With output:", output)
+         print("With output:", output)
         sys.exit(1)
     return [i for i in output.split('\n') if i]
- 
-@@ -204,7 +204,7 @@ class ProvidedSymbol(Symbol):
- # Return a set of symbols provided by a library
- def provided_symbols(obj):
-     if not os.access(obj, os.F_OK):
-        raise Exception("Cannot find lib" + obj)
-+        raise Exception("Cannot find lib " + obj)
-     library = extract_soname(obj)
- 
-     output = command("mklibs-readelf", "--print-symbols-provided", obj)
-@@ -297,27 +297,27 @@ def usage(was_err):
-         outfd = sys.stderr
-     else:
-         outfd = sys.stdout
-    print >> outfd, "Usage: mklibs [OPTION]... -d DEST FILE ..."
-    print >> outfd, "Make a set of minimal libraries for FILE(s) in DEST."
-    print >> outfd, "" 
-    print >> outfd, "  -d, --dest-dir DIRECTORY     create libraries in DIRECTORY"
-    print >> outfd, "  -D, --no-default-lib         omit default libpath (", ':'.join(default_lib_path), ")"
-    print >> outfd, "  -L DIRECTORY[:DIRECTORY]...  add DIRECTORY(s) to the library search path"
-    print >> outfd, "  -l LIBRARY                   add LIBRARY always"
-    print >> outfd, "      --ldlib LDLIB            use LDLIB for the dynamic linker"
-    print >> outfd, "      --libc-extras-dir DIRECTORY  look for libc extra files in DIRECTORY"
-    print >> outfd, "      --target TARGET          prepend TARGET- to the gcc and binutils calls"
-    print >> outfd, "      --root ROOT              search in ROOT for library rpaths"
-    print >> outfd, "      --sysroot ROOT           prepend ROOT to all paths for libraries"
-    print >> outfd, "      --gcc-options OPTIONS    pass OPTIONS to gcc"
-    print >> outfd, "      --libdir DIR             use DIR (e.g. lib64) in place of lib in default paths"
-    print >> outfd, "  -v, --verbose                explain what is being done"
-    print >> outfd, "  -h, --help                   display this help and exit"
-+    print("Usage: mklibs [OPTION]... -d DEST FILE ...", file=outfd)
-+    print("Make a set of minimal libraries for FILE(s) in DEST.", file=outfd)
-+    print("", file=outfd) 
-+    print("  -d, --dest-dir DIRECTORY     create libraries in DIRECTORY", file=outfd)
+@@ -296,7 +296,7 @@ def usage(was_err):
+     print("Make a set of minimal libraries for FILE(s, file=outfd) in DEST.", file=outfd)
+     print("" , file=outfd)
+     print("  -d, --dest-dir DIRECTORY     create libraries in DIRECTORY", file=outfd)
+-    print("  -D, --no-default-lib         omit default libpath (", ':'.join(default_lib_path, file=outfd), ", file=outfd)", file=outfd)
 +    print("  -D, --no-default-lib         omit default libpath (", ':'.join(default_lib_path), ")", file=outfd)
-+    print("  -L DIRECTORY[:DIRECTORY]...  add DIRECTORY(s) to the library search path", file=outfd)
-+    print("  -l LIBRARY                   add LIBRARY always", file=outfd)
-+    print("      --ldlib LDLIB            use LDLIB for the dynamic linker", file=outfd)
-+    print("      --libc-extras-dir DIRECTORY  look for libc extra files in DIRECTORY", file=outfd)
-+    print("      --target TARGET          prepend TARGET- to the gcc and binutils calls", file=outfd)
-+    print("      --root ROOT              search in ROOT for library rpaths", file=outfd)
-+    print("      --sysroot ROOT           prepend ROOT to all paths for libraries", file=outfd)
-+    print("      --gcc-options OPTIONS    pass OPTIONS to gcc", file=outfd)
-+    print("      --libdir DIR             use DIR (e.g. lib64) in place of lib in default paths", file=outfd)
-+    print("  -v, --verbose                explain what is being done", file=outfd)
-+    print("  -h, --help                   display this help and exit", file=outfd)
-     sys.exit(was_err)
- 
- def version(vers):
-    print "mklibs: version ",vers
-    print ""
-+    print("mklibs: version ",vers)
-+    print("")
- 
- #################### main ####################
- ## Usage: ./mklibs.py [OPTION]... -d DEST FILE ...
-@@ -368,8 +368,8 @@ script_pattern = re.compile("^#!\s*/")
- 
- try:
-     optlist, proglist = getopt.getopt(sys.argv[1:], opts, longopts)
-except getopt.GetoptError, msg:
-    print >> sys.stderr, msg
-+except getopt.GetoptError as msg:
-+    print(msg, file=sys.stderr)
-     usage(1)
- 
- for opt, arg in optlist:
-@@ -377,7 +377,7 @@ for opt, arg in optlist:
+     print("  -L DIRECTORY[:DIRECTORY]...  add DIRECTORY(s, file=outfd) to the library search path", file=outfd)
+     print("  -l LIBRARY                   add LIBRARY always", file=outfd)
+     print("      --ldlib LDLIB            use LDLIB for the dynamic linker", file=outfd)
+@@ -372,7 +372,7 @@ for opt, arg in optlist:
         if debuglevel < DEBUG_SPAM:
             debuglevel = debuglevel + 1
     elif opt == "-L":
@ -99,7 +39,7 @@
     elif opt in ("-d", "--dest-dir"):
         dest_path = arg
     elif opt in ("-D", "--no-default-lib"):
-@@ -396,17 +396,17 @@ for opt, arg in optlist:
+@@ -391,7 +391,7 @@ for opt, arg in optlist:
     elif opt in ("-l",):
         force_libs.append(arg)
     elif opt == "--gcc-options":
@ -108,19 +48,7 @@
     elif opt == "--libdir":
         libdir = arg
     elif opt in ("--help", "-h"):
-	usage(0)
-+        usage(0)
-         sys.exit(0)
-     elif opt in ("--version", "-V"):
-         version(vers)
-         sys.exit(0)
-     else:
-        print "WARNING: unknown option: " + opt + "\targ: " + arg
-+        print("WARNING: unknown option: " + opt + "\targ: " + arg)
- 
- if include_default_lib_path == "yes":
-     lib_path.extend([a.replace("/lib/", "/" + libdir + "/") for a in default_lib_path])
-@@ -424,22 +424,22 @@ if ldlib == "LDLIB":
+@@ -419,17 +419,17 @@ if ldlib == "LDLIB":
 objects = {}  # map from inode to filename
 for prog in proglist:
     inode = os.stat(prog)[ST_INO]
@ -141,45 +69,20 @@
         output = command("mklibs-readelf", "--print-interp", obj)
         if output:
             ldlib = output.pop()
-	if ldlib:
-	    break
-+        if ldlib:
-+            break
- 
- if not ldlib:
-     sys.exit("E: Dynamic linker not found, aborting.")
-@@ -454,10 +454,10 @@ for obj in sorted(objects.values()):
-             for rpath_elem in rpath_val:
-                 if not rpath_elem in lib_rpath:
-                     if debuglevel >= DEBUG_VERBOSE:
-                        print "Adding rpath " + rpath_elem + " for " + obj
-+                        print("Adding rpath " + rpath_elem + " for " + obj)
-                     lib_rpath.append(rpath_elem)
-         else:
-            print "warning: " + obj + " may need rpath, but --root not specified"
-+            print("warning: " + obj + " may need rpath, but --root not specified")
- 
- lib_path.extend(lib_rpath)
- 
-@@ -465,12 +465,12 @@ passnr = 1
- available_libs = []
- previous_pass_unresolved = set()
+@@ -462,9 +462,9 @@ previous_pass_unresolved = set()
 while 1:
-    debug(DEBUG_NORMAL, "I: library reduction pass", `passnr`)
-+    debug(DEBUG_NORMAL, "I: library reduction pass", repr(passnr))
+     debug(DEBUG_NORMAL, "I: library reduction pass", str(passnr))
     if debuglevel >= DEBUG_VERBOSE:
-        print "Objects:",
+-        print("Objects:",)
 -        for obj in sorted([x[string.rfind(x, '/') + 1:] for x in objects.values()]):
-            print obj,
-        print
+-            print(obj,)
 +        print("Objects:", end=' ')
 +        for obj in sorted([x[x.rfind('/') + 1:] for x in list(objects.values())]):
 +            print(obj, end=' ')
-+        print()
+         print()
 
     passnr = passnr + 1
-     # Gather all already reduced libraries and treat them as objects as well
-@@ -479,7 +479,7 @@ while 1:
+@@ -474,7 +474,7 @@ while 1:
         obj = dest_path + "/" + lib
         small_libs.append(obj)
         inode = os.stat(obj)[ST_INO]
@ -188,7 +91,7 @@
             debug(DEBUG_SPAM, obj, "is hardlink to", objects[inode])
         else:
             objects[inode] = obj
-@@ -509,7 +509,7 @@ while 1:
+@@ -504,7 +504,7 @@ while 1:
     present_symbols = {}
     checked_libs = small_libs
     checked_libs.extend(available_libs)
@ -197,70 +100,8 @@
     for lib in checked_libs:
         for symbol in provided_symbols(lib):
             debug(DEBUG_SPAM, "present_symbols adding %s" % symbol)
-@@ -529,8 +529,8 @@ while 1:
-             unresolved.add(name)
-             num_unresolved = num_unresolved + 1
- 
-    debug (DEBUG_NORMAL, `len(needed_symbols)`, "symbols,",
-           `num_unresolved`, "unresolved")
-+    debug (DEBUG_NORMAL, repr(len(needed_symbols)), "symbols,",
-+           repr(num_unresolved), "unresolved")
- 
-     if num_unresolved == 0:
-         break
-@@ -539,7 +539,7 @@ while 1:
-         # No progress in last pass. Verify all remaining symbols are weak.
-         for name in unresolved:
-             if not needed_symbols[name].weak:
-                print "WARNING: Unresolvable symbol %s" % name
-+                print("WARNING: Unresolvable symbol %s" % name)
-         break
- 
-     previous_pass_unresolved = unresolved
-@@ -641,9 +641,9 @@ while 1:
-             command(target + "gcc", *cmd)
- 
-             ## DEBUG
-            debug(DEBUG_VERBOSE, so_file, "\t", `os.stat(so_file)[ST_SIZE]`)
-+            debug(DEBUG_VERBOSE, so_file, "\t", repr(os.stat(so_file)[ST_SIZE]))
-             debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so", "\t",
-                  `os.stat(dest_path + "/" + so_file_name + "-so")[ST_SIZE]`)
-+                  repr(os.stat(dest_path + "/" + so_file_name + "-so")[ST_SIZE]))
- 
- # Finalising libs and cleaning up
- for lib in regexpfilter(os.listdir(dest_path), "(.*)-so$"):
-@@ -680,4 +680,4 @@ if not os.access(dest_path + "/" + ld_fu
-     command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
-             ld_file, dest_path + "/" + ld_full_path)
- 
-os.chmod(dest_path + "/" + ld_full_path, 0755)
-+os.chmod(dest_path + "/" + ld_full_path, 0o755)
 --- a/src/mklibs-copy
 +++ b/src/mklibs-copy
-@@ -51,9 +51,9 @@ def command(command, *args):
-     output = pipe.read().strip()
-     status = pipe.close()
-     if status is not None and os.WEXITSTATUS(status) != 0:
-        print "Command failed with status", os.WEXITSTATUS(status),  ":", \
-               command, ' '.join(args)
-	print "With output:", output
-+        print("Command failed with status", os.WEXITSTATUS(status),  ":", \
-+               command, ' '.join(args))
-+        print("With output:", output)
-         sys.exit(1)
-     return output.split('\n')
- 
-@@ -134,8 +134,8 @@ def multiarch(paths):
-         return paths
- 
- def version(vers):
-    print "mklibs: version ",vers
-    print ""
-+    print("mklibs: version ",vers)
-+    print("")
- 
- # Clean the environment
- vers="0.12"
@@ -159,7 +159,7 @@ if include_default_lib_path:
 objects = {}  # map from inode to filename
 for prog in proglist:
@ -270,23 +111,15 @@
         logger.debug("%s is a hardlink to %s", prog, objects[inode])
     elif so_pattern.match(prog):
         logger.debug("%s is a library", prog)
-@@ -169,12 +169,12 @@ for prog in proglist:
+@@ -169,7 +169,7 @@ for prog in proglist:
         logger.debug("%s is no ELF", prog)
 
 if not ldlib:
 -    for obj in objects.values():
 +    for obj in list(objects.values()):
         output = command("mklibs-readelf", "-i", obj)
-	for x in output:
-+        for x in output:
-             ldlib = x
-	if ldlib:
-	    break
-+        if ldlib:
-+            break
- 
- if not ldlib:
-     sys.exit("E: Dynamic linker not found, aborting.")
+         for x in output:
+                 ldlib = x
@@ -182,7 +182,7 @@ if not ldlib:
 logger.info('Using %s as dynamic linker', ldlib)
 
@ -319,9 +152,3 @@
         libraries.update(library_depends(obj))
 
     if libraries == previous_pass_libraries:
-@@ -272,4 +272,4 @@ if not os.access(dest_path + "/" + ld_fu
-     command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
-             ld_file, dest_path + "/" + ld_full_path)
- 
-os.chmod(dest_path + "/" + ld_full_path, 0755)
-+os.chmod(dest_path + "/" + ld_full_path, 0o755)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=mtd-utils
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
-PKG_HASH:=8ad4c5f34716d40646aa28724a2f5616d325a6f119254f914e26976f1f76e9d6
+PKG_SOURCE_URL:=https://infraroot.at/pub/mtd/
+PKG_HASH:=2c6711d15d282c47cb3867b6857340597e26d332c238465134c602e5eef71b99

 PKG_FIXUP:=autoreconf

--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@ -70,7 +70,7 @@
 #include <sys/types.h>
 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
 +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
-@@ -1549,6 +1549,7 @@ static int add_inode(struct stat *st, in
+@@ -1541,6 +1541,7 @@ static int add_inode(struct stat *st, in
 
 	if (c->default_compr != UBIFS_COMPR_NONE)
 		use_flags |= UBIFS_COMPR_FL;
@ -78,7 +78,7 @@
 	if (flags & FS_COMPR_FL)
 		use_flags |= UBIFS_COMPR_FL;
 	if (flags & FS_SYNC_FL)
-@@ -1561,6 +1562,7 @@ static int add_inode(struct stat *st, in
+@@ -1553,6 +1554,7 @@ static int add_inode(struct stat *st, in
 		use_flags |= UBIFS_DIRSYNC_FL;
 	if (fctx)
 		use_flags |= UBIFS_CRYPT_FL;
@ -86,7 +86,7 @@
 	memset(ino, 0, UBIFS_INO_NODE_SZ);
 
 	ino_key_init(&key, inum);
-@@ -1646,7 +1648,9 @@ static int add_dir_inode(const char *pat
+@@ -1638,7 +1640,9 @@ static int add_dir_inode(const char *pat
 		fd = dirfd(dir);
 		if (fd == -1)
 			return sys_err_msg("dirfd failed");
@ -96,7 +96,7 @@
 			flags = 0;
 	}
 
-@@ -1857,6 +1861,7 @@ static int add_file(const char *path_nam
+@@ -1849,6 +1853,7 @@ static int add_file(const char *path_nam
 		dn->ch.node_type = UBIFS_DATA_NODE;
 		key_write(&key, &dn->key);
 		out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
@ -104,7 +104,7 @@
 		if (c->default_compr == UBIFS_COMPR_NONE &&
 		    !c->encrypted && (flags & FS_COMPR_FL))
 #ifdef WITHOUT_LZO
-@@ -1865,6 +1870,7 @@ static int add_file(const char *path_nam
+@@ -1857,6 +1862,7 @@ static int add_file(const char *path_nam
 			use_compr = UBIFS_COMPR_LZO;
 #endif
 		else
@ -112,7 +112,7 @@
 			use_compr = c->default_compr;
 		compr_type = compress_data(buf, bytes_read, &dn->data,
 					   &out_len, use_compr);
-@@ -1924,7 +1930,9 @@ static int add_non_dir(const char *path_
+@@ -1916,7 +1922,9 @@ static int add_non_dir(const char *path_
 		if (fd == -1)
 			return sys_err_msg("failed to open file '%s'",
 					   path_name);
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@ -1,6 +1,6 @@
 --- a/jffsX-utils/Makemodule.am
 +++ b/jffsX-utils/Makemodule.am
-@@ -4,11 +4,19 @@ mkfs_jffs2_SOURCES = \
+@@ -4,7 +4,10 @@ mkfs_jffs2_SOURCES = \
 	jffsX-utils/compr_zlib.c \
 	jffsX-utils/compr.h \
 	jffsX-utils/rbtree.c \
@ -10,7 +10,12 @@
 +	jffsX-utils/lzma/LzmaEnc.c \
 +	jffsX-utils/lzma/LzmaDec.c \
 	jffsX-utils/compr.c \
- 	jffsX-utils/compr_rtime.c
+ 	jffsX-utils/compr_rtime.c \
+ 	jffsX-utils/compr.h \
+@@ -12,8 +15,13 @@ mkfs_jffs2_SOURCES = \
+ 	jffsX-utils/summary.h \
+ 	include/linux/jffs2.h \
+ 	include/mtd/jffs2-user.h
 +
 +if !WITHOUT_LZO
 +mkfs_jffs2_SOURCES += jffsX-utils/compr_lzo.c
@ -20,7 +25,7 @@
 -mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
 +mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) -I./include/linux/lzma
 
- jffs2reader_SOURCES = jffsX-utils/jffs2reader.c
+ jffs2reader_SOURCES = jffsX-utils/jffs2reader.c	include/mtd/jffs2-user.h
 jffs2reader_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS)
 --- a/jffsX-utils/compr.c
 +++ b/jffsX-utils/compr.c
--- a/tools/pkgconf/Makefile
+++ b/tools/pkgconf/Makefile
@ -7,29 +7,32 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=pkgconf
-PKG_VERSION:=1.7.3
+PKG_VERSION:=1.9.3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
-PKG_HASH:=b846aea51cf696c3392a0ae58bef93e2e72f8e7073ca6ad1ed8b01c85871f9c0
-
-HOST_BUILD_PARALLEL:=1
+PKG_HASH:=5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d

 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/meson.mk

 unexport PKG_CONFIG

 HOSTCC := $(HOSTCC_NOCACHE)

+MESON_HOST_ARGS += \
+	-Ddefault_library=static \
+	-Dtests=false
+
 define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
+	$(call Host/Install/Meson)
 	mv $(STAGING_DIR_HOST)/bin/pkgconf $(STAGING_DIR_HOST)/bin/pkg-config.real
 	$(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
 endef

 define Host/Clean
-	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-	$(call Host/Clean/Default)
+	rm -f $(STAGING_DIR_HOST)/bin/pkg-config.real $(STAGING_DIR_HOST)/bin/pkg-config
+	$(call Host/Clean/Meson)
 endef

 $(eval $(call HostBuild))
--- a/tools/pkgconf/files/pkg-config
+++ b/tools/pkgconf/files/pkg-config
@ -1,8 +1,9 @@
 #!/bin/sh

-pkg-config.real \
+${STAGING_DIR_HOST}/bin/pkg-config.real \
 --keep-system-cflags \
 --keep-system-libs \
 --define-variable=prefix="${STAGING_PREFIX}" \
 --define-variable=exec_prefix="${STAGING_PREFIX}" \
--define-variable=bindir="${STAGING_PREFIX}/bin" "$@"
+--define-variable=bindir="${STAGING_PREFIX}/bin" \
+$PKG_CONFIG_EXTRAARGS "$@"
--- a/tools/sstrip/Makefile
+++ b/tools/sstrip/Makefile
@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sstrip
-PKG_VERSION:=3.1a
+PKG_VERSION:=3.2

 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/ELFkickers-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://www.muppetlabs.com/~breadbox/pub/software
 PKG_SOURCE:=ELFkickers-$(PKG_VERSION).tar.gz
-PKG_HASH:=06430880aaf4919c5f99fc629da7000347421668c2cf32bced2d401aac276508
+PKG_HASH:=9b81e6c53e0c94fc198d9882eb737156f36d565152dc32118897c77b06a2687c

 PKG_RELEASE:=1

--- a/tools/zlib/Makefile
+++ b/tools/zlib/Makefile
@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zlib
-PKG_VERSION:=1.2.11
+PKG_VERSION:=1.2.12
 PKG_RELEASE:=1

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@SF/libpng http://www.zlib.net
-PKG_HASH:=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/madler/zlib
+PKG_MIRROR_HASH:=a162fc219763635f0c1591ec515d4b08684e4b0bfb4b1c8e65e4eab18d597c27
+PKG_SOURCE_VERSION:=21767c654d31d2dccdde4330529775c6c5fd5389

 PKG_LICENSE:=Zlib
 PKG_LICENSE_FILES:=README
--- a/tools/zstd/Makefile
+++ b/tools/zstd/Makefile
@ -1,18 +1,17 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zstd
-PKG_VERSION:=1.4.8
+PKG_VERSION:=1.5.2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION)
-PKG_HASH:=32478297ca1500211008d596276f5367c54198495cf677e9439f4791a4c69f24
+PKG_HASH:=7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0

 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:facebook:zstandard

 CMAKE_SOURCE_SUBDIR:=build/cmake
-HOST_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk