Skip to content

Commit d32d2e6

Browse files
committed
xz: update and regen files
5.4.1 -> 5.6.4 regenerate/delete files (this would have detected the infamous xz backdoor)
1 parent 01257b3 commit d32d2e6

File tree

6 files changed

+64
-26
lines changed

6 files changed

+64
-26
lines changed

steps/SHA256SUMS.pkgs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fc850c6f141717ccece106592f6a8edc0cae0d5e9f0968f111455d00072541b6 diffutils-3.10
4343
283a66575b4d7c835f6ebabb38cfb5d7d62032f832ad949f067a85b8a378c36c dist-3.5-236_0.tar.bz2
4444
c30d11b798f3a6198f339ec98a88f8971c6ec13d5dcb10cb7af780752e97509f e2fsprogs-1.45.7_0.tar.bz2
4545
139af6684f275e362e5c247bb830e85c888aa6c263622c1f3e967b2f71ff38f4 ed-1.4_0.tar.bz2
46-
ce69ed8b48cf5440d33c756aadefc48711bdf058ead79121176e13fd9e306c50 file-5.44_0.tar.bz2
46+
208759203a1d9dff0662e77c2cb0c403e071a92f64be6f6b9eaa1ff7911b6318 file-5.44_0.tar.bz2
4747
eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90 findutils-4.2.33_0.tar.bz2
4848
0fb7580f81433aaf9f560e796799c0875c33a8ddf1da27ea523f6f895a1797e6 flex-2.5.11_0.tar.bz2
4949
9cb13b1e60c2c860e2f6fb11efffa74646290ef8461fbc43ed6e5ccfc3bd673f flex-2.5.33_0.tar.bz2
@@ -56,7 +56,7 @@ ab8b5b92de4780b085d8bc7e98ee72ad5ba9c07b26690c579c559b5cc21817eb gc-8.0.4_0.tar
5656
64052d4b2ad1ac405455767b3ac09b77c31d90c38b1d69bfc0922902bd943a2d gcc-4.0.4_0.tar.bz2
5757
da88bb5900f33c1caca9180784e47367e64ec9f258182a147d84168540de1450 gcc-4.0.4_1.tar.bz2
5858
325206b9d09cba81929a13a9ef23058bca3f37a0a82341de15780952e6ea9538 gcc-4.7.4_0.tar.bz2
59-
6b5236819c5963d33dffa022142df70644dbc1960adcb4456017112cf9b79f5b gettext-0.21_0.tar.bz2
59+
cc92686fe97c26ffc684b3e5ead0d142d55efa006d745cc897d13f1c78ef70fd gettext-0.21_0.tar.bz2
6060
309282ba840f80b5e10897b1221f3ff3329b9e05b982c788d03652f411974524 gmp-6.2.1_0.tar.bz2
6161
e89c5a38c49f2beb959e51732ff29bcf3652945e4f1c2bf70d39310c22b0c58f gperf-3.1_0.tar.bz2
6262
c1989fc2855dbb0350c4e5b677028306614a9f4b5cb6c01fd459c5e1abf592b9 grep-2.4_0.tar.bz2
@@ -69,7 +69,7 @@ fc97b59e6b3a99ef457890a00ddee4a9ad44316e41cb746cf6cac1d193e480b7 guile-3.0.9_0.
6969
f59be8342ecf28d94e07c862de2d04dc46a7f9415e5256360d0e2ea6d1e3b252 kbd-1.15_0.tar.bz2
7070
eaac2e938932926864c3866eb60b05c710137f20bb08b6fbdcba752d729f5b68 kexec-linux-1.0.0_0.tar.bz2
7171
fefc818a2044aa979724e4d7cec93901eb4eab0cc1a535043e652e7b5b9f14c6 kexec-tools-2.0.22_0.tar.bz2
72-
5d29cdd1d9857ceaaefe84b3239b35a2a4cf56ae0c3a41b5f6bd9f7f4887186c libarchive-3.5.2_0.tar.bz2
72+
fddddd92e38537c59b8b0b3fa877ae531448d11e050e508873bfee1a49f8fce0 libarchive-3.5.2_0.tar.bz2
7373
36550df491767bb24d2ccab304ce70a3b4956e7c0c0e0c343d922fd57cdafbdd libatomic_ops-7.6.10_0.tar.bz2
7474
ac35de4d4effb2d7936e87087cd80daaa227b38dd683bcb8698be8ec459f3130 libbsd-0.11.8_0.tar.bz2
7575
ed1fe10b0c917ad6a0be05d0187c056cf3ff379e15e51b6b094f708b63ce63de libffi-3.3_0.tar.bz2
@@ -125,5 +125,5 @@ d4fe9460ca561fc2f546f9730f19f541b17dac0bcc42eb190abba856588c3593 tcc-0.9.27_3.t
125125
b34002b84a9ff4a719301a1b78f960e8039996ad321daf8aa3b2990f50933e48 texinfo-6.7_0.tar.bz2
126126
eccc75a240729327a3210bdc87b35293be8413623a98d0af1f62c01f574acaf6 util-linux-2.19.1_0.tar.bz2
127127
a0b6dd21894593b2ebcbfc9f62b1bd0205bba9e593442e307f02300964248550 which-2.21_0.tar.bz2
128-
4e775a6b9e31941c7a9cb2012d16fabb353659134f640688a82690e21fa9a120 xz-5.4.1_0.tar.bz2
128+
ebf9fa677485cd22d5f97ee41edd54525317b95c9e627481018b46baa0ad5c41 xz-5.6.4_0.tar.bz2
129129
ca8ec9876a7334f5f87e1159e0efe343b8b497ffb0dea8b548223035ecd67f9e zlib-1.2.13_0.tar.bz2

steps/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ build: curl-8.5.0
141141
improve: get_network ( CHROOT == False )
142142
build: bash-5.2.15
143143
improve: open_console ( CONSOLES == True )
144-
build: xz-5.4.1
144+
build: xz-5.6.4
145145
build: file-5.44
146146
build: libtool-2.4.7
147147
build: tar-1.34

steps/xz-5.4.1/pass1.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

steps/xz-5.4.1/sources

Lines changed: 0 additions & 1 deletion
This file was deleted.

steps/xz-5.6.4/pass1.sh

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <[email protected]>
2+
# SPDX-FileCopyrightText: 2025 fosslinux <[email protected]>
3+
#
4+
# SPDX-License-Identifier: GPL-3.0-or-later
5+
6+
# sources note: Unfortunately, xz's xz tarballs use SHA-256 checksum, which
7+
# is not widely supported (including by xz), so we use bz2 tarball instead.
8+
9+
src_prepare() {
10+
# Delete translation catalogs
11+
rm po/*.gmo
12+
13+
# Delete generated documentation
14+
rm -rf po4a/man
15+
16+
# Would have detected the xz backdoor
17+
rm tests/files/*.{x,l}z
18+
19+
# Regenerate these c files/headers
20+
rm src/liblzma/rangecoder/price_table.c src/liblzma/lzma/fastpos_table.c \
21+
src/liblzma/lz/lz_encoder_hash_table.h \
22+
src/liblzma/check/crc{32,64}_table_*.h
23+
24+
pushd src/liblzma/rangecoder
25+
gcc -std=c99 -o price_tablegen price_tablegen.c
26+
./price_tablegen > price_table.c
27+
popd
28+
29+
pushd src/liblzma/lzma
30+
gcc -std=c99 -o fastpos_tablegen fastpos_tablegen.c
31+
./fastpos_tablegen > fastpos_table.c
32+
popd
33+
34+
pushd src/liblzma/check
35+
gcc -std=c99 -o crc32_tablegen_le crc32_tablegen.c
36+
./crc32_tablegen_le > crc32_table_le.h
37+
gcc -std=c99 -DWORDS_BIGENDIAN -o crc32_tablegen_be crc32_tablegen.c
38+
./crc32_tablegen_be > crc32_table_be.h
39+
gcc -std=c99 -DLZ_HASH_TABLE -o crc32_tablegen_hashtable crc32_tablegen.c
40+
./crc32_tablegen_hashtable > ../lz/lz_encoder_hash_table.h
41+
42+
gcc -std=c99 -o crc64_tablegen_le crc64_tablegen.c
43+
./crc64_tablegen_le > crc64_table_le.h
44+
gcc -std=c99 -DWORDS_BIGENDIAN -o crc64_tablegen_be crc64_tablegen.c
45+
./crc64_tablegen_be > crc64_table_be.h
46+
popd
47+
48+
AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 autoreconf-2.69 -f
49+
}
50+
51+
src_configure() {
52+
./configure \
53+
--prefix="${PREFIX}" \
54+
--disable-shared \
55+
--disable-nls \
56+
--build=i386-unknown-linux-musl \
57+
--libdir="${LIBDIR}"
58+
}

steps/xz-5.6.4/sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/tukaani-project/xz/releases/download/v5.6.4/xz-5.6.4.tar.bz2 176d510c30d80a23b8050bbc048f2ecaacb823ae48b6821727ed6591f0df9200

0 commit comments

Comments
 (0)