Skip to content

Commit e520e9c

Browse files
committed
Update boxes to debian bullseye
Previous package versions are no longer available and since it looks like that sio2jail works well on kernel used in bullseye it seem reasonable to use it as a target version for boxes.
1 parent 54176d0 commit e520e9c

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

boxes/make_boxes.sh

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ make_minimal() {
1919
make_busybox() {
2020
export BOX="busybox"
2121
empty_box
22-
# busybox with dependencies
23-
extract_deb "busybox/busybox_1.22.0-19+b3_amd64.deb"
24-
extract_deb "glibc/libc6_2.24-11+deb9u4_amd64.deb"
25-
extract_deb "gcc-6/libgcc1_6.3.0-18+deb9u1_amd64.deb"
26-
extract_deb "gcc-6/gcc-6-base_6.3.0-18+deb9u1_amd64.deb"
22+
# busybox with dependencies (busybox from debian bullseye)
23+
extract_deb "busybox/busybox_1.30.1-6+b3_amd64.deb"
24+
extract_deb "glibc/libc6_2.31-13+deb11u11_amd64.deb"
25+
extract_deb "gcc-10/libgcc-s1_10.2.1-6_amd64.deb"
26+
extract_deb "gcc-10/gcc-10-base_10.2.1-6_amd64.deb"
27+
2728
build_box
2829
clean_box
2930
manifest_box >> $MANIFEST
@@ -32,13 +33,13 @@ make_busybox() {
3233
make_python2() {
3334
export BOX="python2"
3435
empty_box
35-
# python2.7 with dependencies
36-
extract_deb "python2.7/python2.7-minimal_2.7.13-2+deb9u3_amd64.deb"
37-
extract_deb "python2.7/libpython2.7-minimal_2.7.13-2+deb9u3_amd64.deb"
38-
extract_deb "zlib/zlib1g_1.2.8.dfsg-5_amd64.deb"
39-
extract_deb "glibc/libc6_2.24-11+deb9u4_amd64.deb"
40-
extract_deb "gcc-6/libgcc1_6.3.0-18+deb9u1_amd64.deb"
41-
extract_deb "gcc-6/gcc-6-base_6.3.0-18+deb9u1_amd64.deb"
36+
# python2.7 with dependencies (python2.7-minimal from debian bullseye)
37+
extract_deb "python2.7/python2.7-minimal_2.7.18-8+deb11u1_amd64.deb"
38+
extract_deb "python2.7/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb"
39+
extract_deb "zlib/zlib1g_1.2.11.dfsg-2+deb11u2_amd64.deb"
40+
extract_deb "glibc/libc6_2.31-13+deb11u11_amd64.deb"
41+
extract_deb "gcc-10/libgcc-s1_10.2.1-6_amd64.deb"
42+
extract_deb "gcc-10/gcc-10-base_10.2.1-6_amd64.deb"
4243

4344
build_box
4445
clean_box
@@ -48,15 +49,15 @@ make_python2() {
4849
make_python3() {
4950
export BOX="python3"
5051
empty_box
51-
# python3.5 with dependencies
52-
extract_deb "python3.5/python3.5-minimal_3.5.3-1+deb9u1_amd64.deb"
53-
extract_deb "python3.5/libpython3.5-minimal_3.5.3-1+deb9u1_amd64.deb"
54-
extract_deb "expat/libexpat1_2.2.0-2+deb9u3_amd64.deb"
55-
extract_deb "zlib/zlib1g_1.2.8.dfsg-5_amd64.deb"
56-
extract_deb "openssl/libssl1.1_1.1.0l-1~deb9u1_amd64.deb"
57-
extract_deb "glibc/libc6_2.24-11+deb9u4_amd64.deb"
58-
extract_deb "gcc-6/libgcc1_6.3.0-18+deb9u1_amd64.deb"
59-
extract_deb "gcc-6/gcc-6-base_6.3.0-18+deb9u1_amd64.deb"
52+
# python3.9 with dependencies (python3.9-minimal from debian bullseye)
53+
extract_deb "python3.9/python3.9-minimal_3.9.2-1_amd64.deb"
54+
extract_deb "python3.9/libpython3.9-minimal_3.9.2-1_amd64.deb"
55+
extract_deb "expat/libexpat1_2.2.10-2+deb11u5_amd64.deb"
56+
extract_deb "zlib/zlib1g_1.2.11.dfsg-2+deb11u2_amd64.deb"
57+
extract_deb "openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb"
58+
extract_deb "glibc/libc6_2.31-13+deb11u11_amd64.deb"
59+
extract_deb "gcc-10/libgcc-s1_10.2.1-6_amd64.deb"
60+
extract_deb "gcc-10/gcc-10-base_10.2.1-6_amd64.deb"
6061

6162
create_file "/dev/urandom"
6263

test/src/sum_python3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#!/usr/bin/python3.5
1+
#!/usr/bin/python3.9
22

33
print(sum(map(int, input().split())))

test/testsuits/test_langs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_cxx(self):
3838
def test_python2(self):
3939
self.perform(self.PYTHON2_PROGRAM_PATH, box='python2')
4040

41-
def test_python3_5(self):
41+
def test_python3(self):
4242
self.perform(self.PYTHON3_PROGRAM_PATH, box='python3',
4343
extra_options=['-b', self.URANDOM_MOCKED_FILE + ':/dev/urandom:ro,dev'])
4444

0 commit comments

Comments
 (0)