From bab3ae2ee7656600a185f4cef11cef94389023af Mon Sep 17 00:00:00 2001
From: Robert Marko <robimarko@gmail.com>
Date: Wed, 3 Apr 2024 19:12:57 +0200
Subject: [PATCH] tools: prefer gz or bz2 tarballs

In the light of recent XZ events, and fundamental XZ issues lets work on
moving away from using XZ.

So, use gz compressed tarballs as sources whenever possible.

dwarves only offers bz2 compressed tarballs, so use those as size
difference is minor compared to XZ.

Signed-off-by: Robert Marko <robimarko@gmail.com>

dwarves
---
 tools/autoconf/Makefile   | 4 ++--
 tools/automake/Makefile   | 4 ++--
 tools/bison/Makefile      | 4 ++--
 tools/ccache/Makefile     | 4 ++--
 tools/coreutils/Makefile  | 4 ++--
 tools/dwarves/Makefile    | 4 ++--
 tools/e2fsprogs/Makefile  | 4 ++--
 tools/expat/Makefile      | 4 ++--
 tools/gmp/Makefile        | 4 ++--
 tools/isl/Makefile        | 4 ++--
 tools/libtool/Makefile    | 4 ++--
 tools/m4/Makefile         | 5 ++---
 tools/mpfr/Makefile       | 4 ++--
 tools/patch/Makefile      | 4 ++--
 tools/pkgconf/Makefile    | 4 ++--
 tools/sed/Makefile        | 4 ++--
 tools/sparse/Makefile     | 4 ++--
 tools/tar/Makefile        | 4 ++--
 tools/util-linux/Makefile | 4 ++--
 tools/zlib/Makefile       | 4 ++--
 20 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile
index a1ce158031..d933c712b4 100644
--- a/tools/autoconf/Makefile
+++ b/tools/autoconf/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=autoconf
 PKG_VERSION:=2.71
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/autoconf
-PKG_HASH:=f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4
+PKG_HASH:=431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 4c1e5758cb..7f129c1d83 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -11,9 +11,9 @@ PKG_CPE_ID:=cpe:/a:gnu:automake
 PKG_VERSION:=1.16.5
 PKG_API_VERSION:=$(word 2,$(subst ., ,$(PKG_VERSION)))
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/automake
-PKG_HASH:=f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469
+PKG_HASH:=07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index 0aa0969b20..97d34b5a16 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bison
 PKG_VERSION:=3.8.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
+PKG_HASH:=06c9e13bdf7eb24d4ceb6b59205a4f67c2c7e7213119644430fe82fbd14a0abb
 PKG_CPE_ID:=cpe:/a:gnu:bison
 
 HOST_BUILD_PARALLEL:=1
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 5720dabf6e..cd2c6d27d5 100644
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ccache
 PKG_VERSION:=4.9.1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
-PKG_HASH:=4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25
+PKG_HASH:=12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile
index 8630286206..69d1dcbd37 100644
--- a/tools/coreutils/Makefile
+++ b/tools/coreutils/Makefile
@@ -10,9 +10,9 @@ PKG_NAME:=coreutils
 PKG_CPE_ID:=cpe:/a:gnu:coreutils
 PKG_VERSION:=9.3
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/coreutils
-PKG_HASH:=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+PKG_HASH:=a33d2c0bc49be3c79a4794944dcd87103bf497b53a14bafcd431c8ca53975252
 
 HOST_BUILD_PARALLEL := 1
 
diff --git a/tools/dwarves/Makefile b/tools/dwarves/Makefile
index f48516fcdf..8d72536b42 100644
--- a/tools/dwarves/Makefile
+++ b/tools/dwarves/Makefile
@@ -6,9 +6,9 @@ PKG_NAME:=dwarves
 PKG_VERSION:=1.26
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://fedorapeople.org/~acme/dwarves/
-PKG_HASH:=ad4c08339850e404609e2808012580b7e98366d2b91054bb93fe6dca94651fb4
+PKG_HASH:=1d8c9a1c2d42e06cc121a70a39c4f621fd28f15c476ed1b7c7b226f41fdd32df
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 7aafc9f06b..567e6a4c9a 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=e2fsprogs
 PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
 PKG_VERSION:=1.47.0
-PKG_HASH:=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
+PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
 
 HOST_BUILD_PARALLEL:=1
diff --git a/tools/expat/Makefile b/tools/expat/Makefile
index 95e631716c..4cd9ef11b2 100644
--- a/tools/expat/Makefile
+++ b/tools/expat/Makefile
@@ -11,8 +11,8 @@ PKG_NAME:=expat
 PKG_CPE_ID:=cpe:/a:libexpat:expat
 PKG_VERSION:=2.6.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3
 PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))
 
 HOST_BUILD_PARALLEL:=1
diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile
index 7f0a7a7a6a..f1aa5b1a40 100644
--- a/tools/gmp/Makefile
+++ b/tools/gmp/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gmp
 PKG_VERSION:=6.3.0
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gmp/
-PKG_HASH:=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
+PKG_HASH:=e56fd59d76810932a0555aa15a14b61c16bed66110d3c75cc2ac49ddaa9ab24c
 PKG_CPE_ID:=cpe:/a:gmplib:gmp
 
 HOST_FIXUP:=autoreconf
diff --git a/tools/isl/Makefile b/tools/isl/Makefile
index 4ad23a6318..1ce20fb49c 100644
--- a/tools/isl/Makefile
+++ b/tools/isl/Makefile
@@ -10,8 +10,8 @@ PKG_NAME:=isl
 PKG_VERSION:=0.26
 
 PKG_SOURCE_URL:=https://libisl.sourceforge.io/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=a0b5cb06d24f9fa9e77b55fabbe9a3c94a336190345c2555f9915bb38e976504
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=b10473024cbf17d7db85323121eff0e50f03de14342a03738b4d384b587ce212
 
 HOST_BUILD_PARALLEL:=1
 
diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile
index 1187191478..dd9afc05bd 100644
--- a/tools/libtool/Makefile
+++ b/tools/libtool/Makefile
@@ -10,9 +10,9 @@ PKG_NAME:=libtool
 PKG_CPE_ID:=cpe:/a:gnu:libtool
 PKG_VERSION:=2.4.7
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d
+PKG_HASH:=04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8
 
 HOST_BUILD_PARALLEL:=1
 
diff --git a/tools/m4/Makefile b/tools/m4/Makefile
index d621000daf..ee369f3cbb 100644
--- a/tools/m4/Makefile
+++ b/tools/m4/Makefile
@@ -10,10 +10,9 @@ PKG_NAME:=m4
 PKG_CPE_ID:=cpe:/a:gnu:m4
 PKG_VERSION:=1.4.19
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
-PKG_CAT:=xzcat
+PKG_HASH:=3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70
 
 HOST_BUILD_PARALLEL:=1
 
diff --git a/tools/mpfr/Makefile b/tools/mpfr/Makefile
index e7f5106a67..bfbbf399d2 100644
--- a/tools/mpfr/Makefile
+++ b/tools/mpfr/Makefile
@@ -11,8 +11,8 @@ PKG_VERSION:=4.2.1
 PKG_CPE_ID:=cpe:/a:mpfr:gnu_mpfr
 
 PKG_SOURCE_URL:=@GNU/mpfr http://www.mpfr.org/mpfr-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=116715552bd966c85b417c424db1bbdf639f53836eb361549d1f8d6ded5cb4c6
 
 HOST_BUILD_PARALLEL:=1
 HOST_FIXUP:=autoreconf
diff --git a/tools/patch/Makefile b/tools/patch/Makefile
index 957fe6e309..f4cf588622 100644
--- a/tools/patch/Makefile
+++ b/tools/patch/Makefile
@@ -11,9 +11,9 @@ PKG_VERSION:=2.7.6
 PKG_RELEASE:=7
 PKG_CPE_ID:=cpe:/a:gnu:patch
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/patch
-PKG_HASH:=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
+PKG_HASH:=8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e
 
 HOST_BUILD_PARALLEL := 1
 
diff --git a/tools/pkgconf/Makefile b/tools/pkgconf/Makefile
index e1dea71c8a..517b8d847b 100644
--- a/tools/pkgconf/Makefile
+++ b/tools/pkgconf/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=pkgconf
 PKG_VERSION:=2.1.1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
-PKG_HASH:=3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5
+PKG_HASH:=1a00b7fa08c7b506a24c40f7cc8d9e0e59be748d731af8f7aa0b4d722bd8ccbe
 
 PKG_CPE_ID:=cpe:/a:pkgconf:pkgconf
 
diff --git a/tools/sed/Makefile b/tools/sed/Makefile
index 49cbc72e6e..f6bb61e229 100644
--- a/tools/sed/Makefile
+++ b/tools/sed/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=sed
 PKG_VERSION:=4.9
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181
+PKG_HASH:=d1478a18f033a73ac16822901f6533d30b6be561bcbce46ffd7abce93602282e
 PKG_CPE_ID:=cpe:/a:gnu:sed
 
 export SED:=
diff --git a/tools/sparse/Makefile b/tools/sparse/Makefile
index e08bd1d05f..74d25bfbde 100644
--- a/tools/sparse/Makefile
+++ b/tools/sparse/Makefile
@@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=sparse
 
 PKG_VERSION:=0.6.4
-PKG_HASH:=6ab28b4991bc6aedbd73550291360aa6ab3df41f59206a9bde9690208a6e387c
+PKG_HASH:=8b907c007459a66db110496f0a02fcff1c3c8b67ddff37b959fb102a28424209
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/software/devel/sparse/dist/
 
 PKG_BUILD_PARALLEL:=1
diff --git a/tools/tar/Makefile b/tools/tar/Makefile
index 47aad9ec6e..a05ffc4381 100644
--- a/tools/tar/Makefile
+++ b/tools/tar/Makefile
@@ -10,9 +10,9 @@ PKG_NAME:=tar
 PKG_CPE_ID:=cpe:/a:gnu:tar
 PKG_VERSION:=1.34
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/tar
-PKG_HASH:=63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28
+PKG_HASH:=03d908cf5768cfe6b7ad588c921c6ed21acabfb2b79b788d1330453507647aed
 
 HOST_BUILD_PARALLEL:=1
 
diff --git a/tools/util-linux/Makefile b/tools/util-linux/Makefile
index acd819e38b..846005ebe9 100644
--- a/tools/util-linux/Makefile
+++ b/tools/util-linux/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=util-linux
 PKG_VERSION:=2.39.3
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39
-PKG_HASH:=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+PKG_HASH:=40ea07584d56c310455471afa92c119ec259776a561af7159cc802344c2c370d
 PKG_CPE_ID:=cpe:/a:kernel:util-linux
 
 HOST_BUILD_PARALLEL:=1
diff --git a/tools/zlib/Makefile b/tools/zlib/Makefile
index 6786e14be4..f743445678 100644
--- a/tools/zlib/Makefile
+++ b/tools/zlib/Makefile
@@ -11,9 +11,9 @@ PKG_NAME:=zlib
 PKG_VERSION:=1.3.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/madler/zlib/releases/download/v$(PKG_VERSION)
-PKG_HASH:=38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
+PKG_HASH:=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
 
 PKG_LICENSE:=Zlib
 PKG_LICENSE_FILES:=README
-- 
2.30.2