diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index b8bbff4ad..56a54c98e 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -43,7 +43,7 @@ fc850c6f141717ccece106592f6a8edc0cae0d5e9f0968f111455d00072541b6 diffutils-3.10 283a66575b4d7c835f6ebabb38cfb5d7d62032f832ad949f067a85b8a378c36c dist-3.5-236_0.tar.bz2 c30d11b798f3a6198f339ec98a88f8971c6ec13d5dcb10cb7af780752e97509f e2fsprogs-1.45.7_0.tar.bz2 139af6684f275e362e5c247bb830e85c888aa6c263622c1f3e967b2f71ff38f4 ed-1.4_0.tar.bz2 -ce69ed8b48cf5440d33c756aadefc48711bdf058ead79121176e13fd9e306c50 file-5.44_0.tar.bz2 +208759203a1d9dff0662e77c2cb0c403e071a92f64be6f6b9eaa1ff7911b6318 file-5.44_0.tar.bz2 eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90 findutils-4.2.33_0.tar.bz2 0fb7580f81433aaf9f560e796799c0875c33a8ddf1da27ea523f6f895a1797e6 flex-2.5.11_0.tar.bz2 9cb13b1e60c2c860e2f6fb11efffa74646290ef8461fbc43ed6e5ccfc3bd673f flex-2.5.33_0.tar.bz2 @@ -56,12 +56,12 @@ ab8b5b92de4780b085d8bc7e98ee72ad5ba9c07b26690c579c559b5cc21817eb gc-8.0.4_0.tar 64052d4b2ad1ac405455767b3ac09b77c31d90c38b1d69bfc0922902bd943a2d gcc-4.0.4_0.tar.bz2 da88bb5900f33c1caca9180784e47367e64ec9f258182a147d84168540de1450 gcc-4.0.4_1.tar.bz2 325206b9d09cba81929a13a9ef23058bca3f37a0a82341de15780952e6ea9538 gcc-4.7.4_0.tar.bz2 -6b5236819c5963d33dffa022142df70644dbc1960adcb4456017112cf9b79f5b gettext-0.21_0.tar.bz2 +cc92686fe97c26ffc684b3e5ead0d142d55efa006d745cc897d13f1c78ef70fd gettext-0.21_0.tar.bz2 309282ba840f80b5e10897b1221f3ff3329b9e05b982c788d03652f411974524 gmp-6.2.1_0.tar.bz2 e89c5a38c49f2beb959e51732ff29bcf3652945e4f1c2bf70d39310c22b0c58f gperf-3.1_0.tar.bz2 c1989fc2855dbb0350c4e5b677028306614a9f4b5cb6c01fd459c5e1abf592b9 grep-2.4_0.tar.bz2 bfeb5cad6720cd6ff629095f562fc7b60e2b352d248c4f8bdc9de3db1ed09b17 grep-3.7_0.tar.bz2 -3f08414ffc65cebc8a635b0339f95c7ea0259d33cb53676293c3b28b0453f8c1 grub-2.06_0.tar.bz2 +46280749718c1d05ae1d136001fba3826abef88fcca10ddb917c921059331910 grub-2.06_0.tar.bz2 fc97b59e6b3a99ef457890a00ddee4a9ad44316e41cb746cf6cac1d193e480b7 guile-3.0.9_0.tar.bz2 4b784b57ed27e22750cf79492bb65bf68bd8211d942eeb74490981effa41196b gzip-1.13_0.tar.bz2 30910d1d4af913272a46d76e824155bf3d023347a940db03837250000c17bab5 heirloom-devtools-070527_0.tar.bz2 @@ -69,7 +69,7 @@ fc97b59e6b3a99ef457890a00ddee4a9ad44316e41cb746cf6cac1d193e480b7 guile-3.0.9_0. f59be8342ecf28d94e07c862de2d04dc46a7f9415e5256360d0e2ea6d1e3b252 kbd-1.15_0.tar.bz2 eaac2e938932926864c3866eb60b05c710137f20bb08b6fbdcba752d729f5b68 kexec-linux-1.0.0_0.tar.bz2 fefc818a2044aa979724e4d7cec93901eb4eab0cc1a535043e652e7b5b9f14c6 kexec-tools-2.0.22_0.tar.bz2 -5d29cdd1d9857ceaaefe84b3239b35a2a4cf56ae0c3a41b5f6bd9f7f4887186c libarchive-3.5.2_0.tar.bz2 +fddddd92e38537c59b8b0b3fa877ae531448d11e050e508873bfee1a49f8fce0 libarchive-3.5.2_0.tar.bz2 36550df491767bb24d2ccab304ce70a3b4956e7c0c0e0c343d922fd57cdafbdd libatomic_ops-7.6.10_0.tar.bz2 ac35de4d4effb2d7936e87087cd80daaa227b38dd683bcb8698be8ec459f3130 libbsd-0.11.8_0.tar.bz2 ed1fe10b0c917ad6a0be05d0187c056cf3ff379e15e51b6b094f708b63ce63de libffi-3.3_0.tar.bz2 @@ -108,12 +108,12 @@ dde16a4b5e5fa049e394b7f7f8717a94507cbfc8b8ce9bc25b5eea0b19323857 python-2.0.1_1 c4dc017b143779911110615f025ee8e6411527b92b0dfb9b6c3b83ae3be888ee python-2.3.7_0.tar.bz2 0198b78865bf84d1edbf94b062e82bbf7583cbc298f589d755b1f21e38cc5ee7 python-2.3.7_1.tar.bz2 2dd749e9ca32f30bf254c73e806764261340b7ecaa5ec0fe05ad83ad68e4b3c2 python-2.5.6_0.tar.bz2 -8d6fa373c32917f9b46f24056e70b142d4853a64c144149b4a7b9608f46dd47b python-3.11.1_0.tar.bz2 +0435dbb39f0eee5934ce1819ab7eb3595def1a1dd83adbef421b80b6d678893c python-3.11.1_0.tar.bz2 6b590de17e11412c76a49828d619f54426720385993ac1218cab817233518270 python-3.1.5_0.tar.bz2 cd784d79303b3a24083473926e273507ec002292a23fed5fd376ca5bb15de78d python-3.1.5_1.tar.bz2 -aa2499d9024af408e70cdface1c4dd56feb7f2e51ef628b530285960d09c667e python-3.3.7_0.tar.bz2 -e28cbec8738e87a691bfc44e61ca6c1bd43a3babca0c796a35650eafac425aaf python-3.4.10_0.tar.bz2 -81f624fbbadc814c0e6b41157794de8450816324caf1f89bd2ef3fa7db5b96a2 python-3.8.16_0.tar.bz2 +203b660c85c1eb4a32b6829039bdcda35966b81c4ec3da979fa22573ee984a91 python-3.3.7_0.tar.bz2 +df87faf4583fb796c0635650217a566f60d19de6e0f2e680d5f70b400a13f599 python-3.4.10_0.tar.bz2 +6f91127aa7a6657ae3a216a2486b699aa6ae3e4aaad05e128b912def553f5718 python-3.8.16_0.tar.bz2 18d517fa1195aa82e3e0eb7f261eb3addb9a43492040b16be04571639781577e sed-4.0.9_0.tar.bz2 de71facdd9679fbbb0152c40aa3ce88339ce87920508f7781d2b75ccd6acfe67 sed-4.8_0.tar.bz2 a7ab1ac6b066e266954a547823157df741d37d619a493d5672c07a9e1e685d67 shadow-4.14.3_0.tar.bz2 @@ -125,5 +125,5 @@ d4fe9460ca561fc2f546f9730f19f541b17dac0bcc42eb190abba856588c3593 tcc-0.9.27_3.t b34002b84a9ff4a719301a1b78f960e8039996ad321daf8aa3b2990f50933e48 texinfo-6.7_0.tar.bz2 eccc75a240729327a3210bdc87b35293be8413623a98d0af1f62c01f574acaf6 util-linux-2.19.1_0.tar.bz2 a0b6dd21894593b2ebcbfc9f62b1bd0205bba9e593442e307f02300964248550 which-2.21_0.tar.bz2 -4e775a6b9e31941c7a9cb2012d16fabb353659134f640688a82690e21fa9a120 xz-5.4.1_0.tar.bz2 +ebf9fa677485cd22d5f97ee41edd54525317b95c9e627481018b46baa0ad5c41 xz-5.6.4_0.tar.bz2 ca8ec9876a7334f5f87e1159e0efe343b8b497ffb0dea8b548223035ecd67f9e zlib-1.2.13_0.tar.bz2 diff --git a/steps/manifest b/steps/manifest index 9184b9ffe..79938e7da 100644 --- a/steps/manifest +++ b/steps/manifest @@ -141,7 +141,7 @@ build: curl-8.12.1 improve: get_network ( CHROOT == False ) build: bash-5.2.15 improve: open_console ( CONSOLES == True ) -build: xz-5.4.1 +build: xz-5.6.4 build: file-5.44 build: libtool-2.4.7 build: tar-1.34 diff --git a/steps/xz-5.4.1/pass1.sh b/steps/xz-5.4.1/pass1.sh deleted file mode 100755 index dad9fb80a..000000000 --- a/steps/xz-5.4.1/pass1.sh +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - # Delete translation catalogs - find . -name "*.gmo" -delete - rm -rf po4a/man - - AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 autoreconf-2.69 -f -} - -src_configure() { - ./configure \ - --prefix="${PREFIX}" \ - --disable-shared \ - --disable-nls \ - --build=i386-unknown-linux-musl \ - --libdir="${LIBDIR}" -} diff --git a/steps/xz-5.4.1/sources b/steps/xz-5.4.1/sources deleted file mode 100644 index 630fa12c7..000000000 --- a/steps/xz-5.4.1/sources +++ /dev/null @@ -1 +0,0 @@ -https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.bz2 dd172acb53867a68012f94c17389401b2f274a1aa5ae8f84cbfb8b7e383ea8d3 diff --git a/steps/xz-5.6.4/pass1.sh b/steps/xz-5.6.4/pass1.sh new file mode 100755 index 000000000..57ee4f56d --- /dev/null +++ b/steps/xz-5.6.4/pass1.sh @@ -0,0 +1,58 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# SPDX-FileCopyrightText: 2025 fosslinux +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# sources note: Unfortunately, xz's xz tarballs use SHA-256 checksum, which +# is not widely supported (including by xz), so we use bz2 tarball instead. + +src_prepare() { + # Delete translation catalogs + rm po/*.gmo + + # Delete generated documentation + rm -rf po4a/man + + # Would have detected the xz backdoor + rm tests/files/*.{x,l}z + + # Regenerate these c files/headers + rm src/liblzma/rangecoder/price_table.c src/liblzma/lzma/fastpos_table.c \ + src/liblzma/lz/lz_encoder_hash_table.h \ + src/liblzma/check/crc{32,64}_table_*.h + + pushd src/liblzma/rangecoder + gcc -std=c99 -o price_tablegen price_tablegen.c + ./price_tablegen > price_table.c + popd + + pushd src/liblzma/lzma + gcc -std=c99 -o fastpos_tablegen fastpos_tablegen.c + ./fastpos_tablegen > fastpos_table.c + popd + + pushd src/liblzma/check + gcc -std=c99 -o crc32_tablegen_le crc32_tablegen.c + ./crc32_tablegen_le > crc32_table_le.h + gcc -std=c99 -DWORDS_BIGENDIAN -o crc32_tablegen_be crc32_tablegen.c + ./crc32_tablegen_be > crc32_table_be.h + gcc -std=c99 -DLZ_HASH_TABLE -o crc32_tablegen_hashtable crc32_tablegen.c + ./crc32_tablegen_hashtable > ../lz/lz_encoder_hash_table.h + + gcc -std=c99 -o crc64_tablegen_le crc64_tablegen.c + ./crc64_tablegen_le > crc64_table_le.h + gcc -std=c99 -DWORDS_BIGENDIAN -o crc64_tablegen_be crc64_tablegen.c + ./crc64_tablegen_be > crc64_table_be.h + popd + + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 autoreconf-2.69 -f +} + +src_configure() { + ./configure \ + --prefix="${PREFIX}" \ + --disable-shared \ + --disable-nls \ + --build=i386-unknown-linux-musl \ + --libdir="${LIBDIR}" +} diff --git a/steps/xz-5.6.4/sources b/steps/xz-5.6.4/sources new file mode 100644 index 000000000..d5f0f8f04 --- /dev/null +++ b/steps/xz-5.6.4/sources @@ -0,0 +1 @@ +https://github.com/tukaani-project/xz/releases/download/v5.6.4/xz-5.6.4.tar.bz2 176d510c30d80a23b8050bbc048f2ecaacb823ae48b6821727ed6591f0df9200