Skip to content

Commit 3567488

Browse files
jslobodzianjslobodzian
authored
Merge for Mariner 2.0 Dec 2023 Monthly Update. (#6878)
2 parents d68aba1 + 4e8b6fc commit 3567488

File tree

194 files changed

+17256
-548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+17256
-548
lines changed

‎.pipelines/templates/PackageBuild.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ parameters:
6262
- "false"
6363
- "true"
6464

65+
- name: maxCascadingRebuilds
66+
type: string
67+
default: ""
68+
6569
- name: outputArtifactsFolder
6670
type: string
6771
default: "$(Build.ArtifactStagingDirectory)"
@@ -146,6 +150,7 @@ steps:
146150
echo "ERROR: toolchain archive not found!" >&2
147151
exit 1
148152
fi
153+
echo "##vso[task.setvariable variable=toolchainArchive]$toolchain_archive"
149154
150155
sudo make -C "${{ parameters.buildRepoRoot }}/toolkit" toolchain TOOLCHAIN_ARCHIVE="$toolchain_archive"
151156
displayName: "Populate toolchain"
@@ -192,18 +197,24 @@ steps:
192197
use_ccache_arg="USE_CCACHE=n"
193198
fi
194199
200+
if [[ -n "${{ parameters.customToolchainArtifactName }}" ]]; then
201+
toolchain_archive_arg="TOOLCHAIN_ARCHIVE=$(toolchainArchive)"
202+
fi
203+
195204
sudo make -C "${{ parameters.buildRepoRoot }}/toolkit" build-packages -j$(nproc) \
196205
CONCURRENT_PACKAGE_BUILDS=${{ parameters.concurrentPackageBuilds }} \
197206
CONFIG_FILE="" \
207+
MAX_CASCADING_REBUILDS="${{ parameters.maxCascadingRebuilds }}" \
198208
MAX_CPU="${{ parameters.maxCPU }}" \
199209
REBUILD_TOOLS=y \
200210
REPO_LIST="${{ parameters.extraPackageRepos }}" \
201211
SPECS_DIR="${{ parameters.buildRepoRoot }}/${{ parameters.specsFolderPath }}" \
202212
SRPM_PACK_LIST="${{ parameters.srpmPackList }}" \
213+
TEST_RERUN_LIST="${{ parameters.testRerunList }}" \
203214
$delta_fetch_arg \
204215
$quick_rebuild_packages_arg \
205216
$run_check_arg \
206-
TEST_RERUN_LIST="${{ parameters.testRerunList }}" \
217+
$toolchain_archive_arg \
207218
$use_ccache_arg
208219
displayName: "Build packages"
209220

‎SPECS-EXTENDED/buildah/buildah.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
127127
- Bump release to rebuild against glibc 2.35-6
128128

129129
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.18.0-20
130-
- Bump release to rebuild with go 1.20.10
130+
- Bump release to rebuild with go 1.20.9
131131

132132
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.18.0-19
133133
- Bump release to rebuild with updated version of Go.

‎SPECS-EXTENDED/containernetworking-plugins/containernetworking-plugins.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
130130

131131
%changelog
132132
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.1.1-13
133-
- Bump release to rebuild with go 1.20.10
133+
- Bump release to rebuild with go 1.20.9
134134

135135
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.1.1-12
136136
- Bump release to rebuild with updated version of Go.

‎SPECS-EXTENDED/delve/delve.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ done
7373

7474
%changelog
7575
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.5.0-16
76-
- Bump release to rebuild with go 1.20.10
76+
- Bump release to rebuild with go 1.20.9
7777

7878
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.5.0-15
7979
- Bump release to rebuild with updated version of Go.

‎SPECS-EXTENDED/linuxptp/linuxptp.signatures.json

-11
This file was deleted.

‎SPECS-EXTENDED/podman/podman.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
391391
- Bump release to rebuild against glibc 2.35-6
392392

393393
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 4.1.1-17
394-
- Bump release to rebuild with go 1.20.10
394+
- Bump release to rebuild with go 1.20.9
395395

396396
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 4.1.1-16
397397
- Bump release to rebuild with updated version of Go.

‎SPECS-EXTENDED/umoci/umoci.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ go test -mod=vendor
4040

4141
%changelog
4242
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.4.7-13
43-
- Bump release to rebuild with go 1.20.10
43+
- Bump release to rebuild with go 1.20.9
4444

4545
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 0.4.7-12
4646
- Bump release to rebuild with updated version of Go.

‎SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.137.1
12+
Version: 5.15.138.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Tue Nov 21 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.138.1-1
157+
- Auto-upgrade to 5.15.138.1
158+
159+
* Mon Nov 20 2023 Rachel Menge <[email protected]> - 5.15.137.1-2
160+
- Bump release to match kernel
161+
156162
* Mon Nov 06 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.137.1-1
157163
- Auto-upgrade to 5.15.137.1
158164

‎SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.137.1
7+
Version: 5.15.138.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Tue Nov 21 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.138.1-1
153+
- Auto-upgrade to 5.15.138.1
154+
155+
* Mon Nov 20 2023 Rachel Menge <[email protected]> - 5.15.137.1-2
156+
- Bump release to match kernel
157+
152158
* Mon Nov 06 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.137.1-1
153159
- Auto-upgrade to 5.15.137.1
154160

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec

+17-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.137.1
13-
Release: 1%{?dist}
12+
Version: 5.15.138.1
13+
Release: 4%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -153,6 +153,21 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Tue Nov 28 2023 Juan Camposeco <[email protected]> - 5.15.138.1-4
157+
- Bump release to match kernel
158+
159+
* Tue Nov 28 2023 Thien Trung Vuong <[email protected]> - 5.15.138.1-3
160+
- Bump release to match kernel
161+
162+
* Wed Nov 22 2023 David Daney <[email protected]> - 5.15.138.1-2
163+
- Bump release to match kernel
164+
165+
* Tue Nov 21 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.138.1-1
166+
- Auto-upgrade to 5.15.138.1
167+
168+
* Mon Nov 20 2023 Rachel Menge <[email protected]> - 5.15.137.1-2
169+
- Bump release to match kernel
170+
156171
* Mon Nov 06 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.137.1-1
157172
- Auto-upgrade to 5.15.137.1
158173

‎SPECS/KeysInUse-OpenSSL/KeysInUse-OpenSSL.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fi
7575

7676
%changelog
7777
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.3.4-3
78-
- Bump release to rebuild with go 1.20.10
78+
- Bump release to rebuild with go 1.20.9
7979

8080
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 0.3.4-2
8181
- Bump release to rebuild with updated version of Go.

‎SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SPECS/LICENSES-AND-NOTICES/data/licenses.json

+2
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@
184184
"dogtail",
185185
"dos2unix",
186186
"dotconf",
187+
"double-conversion",
187188
"dovecot",
188189
"dpdk",
189190
"dpkg",
@@ -1679,6 +1680,7 @@
16791680
"python-isodate",
16801681
"python-isort",
16811682
"python-itsdangerous",
1683+
"python-junit-xml",
16821684
"python-justbases",
16831685
"python-justbytes",
16841686
"python-jwcrypto",

‎SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ cp appgw-ingress %{buildroot}%{_bindir}/
5555

5656
%changelog
5757
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.4.0-16
58-
- Bump release to rebuild with go 1.20.10
58+
- Bump release to rebuild with go 1.20.9
5959

6060
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.4.0-15
6161
- Bump release to rebuild with updated version of Go.

‎SPECS/azcopy/azcopy.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ go test -mod=vendor
6262

6363
%changelog
6464
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 10.15.0-14
65-
- Bump release to rebuild with go 1.20.10
65+
- Bump release to rebuild with go 1.20.9
6666

6767
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 10.15.0-13
6868
- Bump release to rebuild with updated version of Go.

‎SPECS/blobfuse/blobfuse.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ install -p -m 755 build/blobfuse %{buildroot}%{_bindir}/
4747

4848
%changelog
4949
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.4.5-13
50-
- Bump release to rebuild with go 1.20.10
50+
- Bump release to rebuild with go 1.20.9
5151

5252
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.4.5-12
5353
- Bump release to rebuild with updated version of Go.

‎SPECS/blobfuse2/blobfuse2.signatures.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
3-
"blobfuse2-2.1.1.tar.gz": "6bbed0d7db05ecfe7b7e12b5c4506dde1e2ef018ce1ac6fe6c8b7d697af24968",
4-
"blobfuse2-2.1.1-vendor.tar.gz": "85cbf93aacaa63e583dd9a72f4823f9c993449d5f2ab2332d8b97b4bf91e7da0"
3+
"blobfuse2-2.1.2.tar.gz": "4605015d99c7ffac37ae464aa1d23c11ecd6218122acb06f1c46ac7bdced908e",
4+
"blobfuse2-2.1.2-vendor.tar.gz": "84229241b170316438aa408ae38216e01c54fffdbe50b59ae3b5ab1b4f7122c6"
55
}
66
}

‎SPECS/blobfuse2/blobfuse2.spec

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%global debug_package %{nil}
22

33
%define our_gopath %{_topdir}/.gopath
4-
%define blobfuse2_version 2.1.1
4+
%define blobfuse2_version 2.1.2
55
%define blobfuse2_health_monitor bfusemon
66

77
Summary: FUSE adapter - Azure Storage
@@ -80,11 +80,14 @@ install -D -m 0644 ./setup/blobfuse2-logrotate %{buildroot}%{_sysconfdir}/logrot
8080
%{_sysconfdir}/logrotate.d/blobfuse2
8181

8282
%changelog
83+
* Fri Nov 17 2023 Anubhuti Shruti <[email protected]> - 2.1.2-1
84+
- Bump version to 2.1.2
85+
8386
* Thu Nov 02 2023 Sourav Gupta <[email protected]> - 2.1.1-1
8487
- Bump version to 2.1.1
8588

8689
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 2.1.0-3
87-
- Bump release to rebuild with go 1.20.10
90+
- Bump release to rebuild with go 1.20.9
8891

8992
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 2.1.0-2
9093
- Bump release to rebuild with updated version of Go.

‎SPECS/busybox/busybox-static.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
3131
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
3232
# CONFIG_FEATURE_PREFER_APPLETS is not set
3333
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
34-
# CONFIG_SELINUX is not set
34+
CONFIG_SELINUX=y
3535
# CONFIG_FEATURE_CLEAN_UP is not set
3636
CONFIG_PLATFORM_LINUX=y
3737
#
@@ -176,7 +176,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
176176
CONFIG_FEATURE_TAR_TO_COMMAND=y
177177
CONFIG_FEATURE_TAR_UNAME_GNAME=y
178178
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
179-
# CONFIG_FEATURE_TAR_SELINUX is not set
179+
CONFIG_FEATURE_TAR_SELINUX=y
180180
CONFIG_UNZIP=y
181181
CONFIG_FEATURE_UNZIP_CDF=y
182182
CONFIG_FEATURE_UNZIP_BZIP2=y

‎SPECS/busybox/busybox.signatures.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"Signatures": {
33
"busybox-1.35.0.tar.bz2": "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694",
44
"busybox-petitboot.config": "28a4006863e0125bb564159c120067cb83b52ee0a829579cd399274cc78a10be",
5-
"busybox-static.config": "6f2f534548da57df8b1f5fd4dfe6ceece0f1b97bf7d0baa4c484ac9850cf8e37"
5+
"busybox-static.config": "e97bc24c897e41e5a6fc6b54955b20e3c49ea5828f9ecba6ba520f8291470e58"
66
}
77
}

‎SPECS/busybox/busybox.spec

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Statically linked binary providing simplified versions of system commands
22
Name: busybox
33
Version: 1.35.0
4-
Release: 8%{?dist}
4+
Release: 9%{?dist}
55
License: GPLv2
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -15,6 +15,8 @@ Patch2: awk-input-numbers-are-never-octal-or-hex-only-progra.patch
1515
Patch3: CVE-2022-30065.patch
1616
Patch4: ash-fix-use-after-free-in-pattern-substituon-code.patch
1717
Patch5: ash-fix-use-after-free-in-bash-pattern-substitution.patch
18+
Patch6: selinux-copy-file.patch
19+
Patch7: selinux-cp-a.patch
1820
BuildRequires: gcc
1921
BuildRequires: glibc-static >= 2.35-6%{?dist}
2022
BuildRequires: libselinux-devel >= 1.27.7-2
@@ -94,6 +96,10 @@ install -m 644 docs/busybox.petitboot.1 %{buildroot}/%{_mandir}/man1/busybox.pet
9496
%{_mandir}/man1/busybox.petitboot.1.gz
9597

9698
%changelog
99+
* Thu Nov 16 2023 Chris PeBenito <[email protected]> - 1.35.0-9
100+
- Enable SELinux features.
101+
- Improve SELinux behavior for copy funtions.
102+
97103
* Wed Oct 04 2023 Minghe Ren <[email protected]> - 1.35.0-8
98104
- Bump release to rebuild against glibc 2.35-6
99105

‎SPECS/busybox/selinux-copy-file.patch

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
From 23b2d8b498939723413a60adc6b29e37ec46b91e Mon Sep 17 00:00:00 2001
2+
From: Chris PeBenito <[email protected]>
3+
Date: Wed, 25 Mar 2020 16:43:17 -0400
4+
Subject: copy_file(): Revise completion of SELinux security context
5+
preserve/set.
6+
7+
The existing setfscreatecon() at the beginning of copy_file() is the secure
8+
method for setting the context of new files, but it doesn't apply to
9+
existing files. Change the setfilecon() to only run on preexisting files.
10+
11+
Signed-off-by: Chris PeBenito <[email protected]>
12+
13+
diff -ur busybox-1.35.0.orig/libbb/copy_file.c busybox-1.35.0/libbb/copy_file.c
14+
--- busybox-1.35.0.orig/libbb/copy_file.c 2021-12-26 16:53:20.000000000 +0000
15+
+++ busybox-1.35.0/libbb/copy_file.c 2023-08-16 22:04:45.557799523 +0000
16+
@@ -327,19 +327,22 @@
17+
if ((flags & (FILEUTILS_PRESERVE_SECURITY_CONTEXT|FILEUTILS_SET_SECURITY_CONTEXT))
18+
&& is_selinux_enabled() > 0
19+
) {
20+
- security_context_t con;
21+
- if (getfscreatecon(&con) == -1) {
22+
+ /* Failure to preserve the security context isn't fatal here since
23+
+ * the copy has been done at this point. */
24+
+ security_context_t con = NULL;
25+
+ if (getfscreatecon(&con) < 0)
26+
bb_simple_perror_msg("getfscreatecon");
27+
- return -1;
28+
- }
29+
- if (con) {
30+
- if (setfilecon(dest, con) == -1) {
31+
- bb_perror_msg("setfilecon:%s,%s", dest, con);
32+
- freecon(con);
33+
- return -1;
34+
- }
35+
- freecon(con);
36+
- }
37+
+
38+
+ if (setfscreatecon(NULL) < 0)
39+
+ bb_perror_msg("can't reset fscreate");
40+
+
41+
+ /* setfscreatecon() only works when a file is created. If dest
42+
+ * preexisted, use setfilecon instead */
43+
+ if (con && dest_exists)
44+
+ if (fsetfilecon(dst_fd, con) < 0)
45+
+ bb_perror_msg("fsetfilecon:%s,%s", dest, con);
46+
+
47+
+ freecon(con);
48+
}
49+
#endif
50+
#if ENABLE_FEATURE_CP_REFLINK

0 commit comments

Comments
 (0)