Skip to content

Commit 10f99e8

Browse files
jslobodzianjslobodzian
committed
Merge branch '1.0-dev' into 1.0
2 parents 035c997 + f463558 commit 10f99e8

File tree

107 files changed

+11513
-1376
lines changed

Some content is hidden

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

107 files changed

+11513
-1376
lines changed

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 5.10.102.1
13-
Release: 1%{?dist}
13+
Release: 3%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -147,6 +147,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
147147
%endif
148148

149149
%changelog
150+
* Fri Mar 25 2022 Rachel Menge <[email protected]> - 5.10.102.1-3
151+
- Bump release number to match kernel release
152+
153+
* Fri Mar 18 2022 Rachel Menge <[email protected]> - 5.10.102.1-2
154+
- Bump release number to match kernel release
155+
150156
* Mon Feb 28 2022 Rachel Menge <[email protected]> - 5.10.102.1-1
151157
- Update source to 5.10.102.1
152158

‎SPECS/audit/audit.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: Kernel Audit Tool
55
Name: audit
66
Version: 3.0
7-
Release: 13%{?dist}
7+
Release: 14%{?dist}
88
Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha8.tar.gz
99
Patch0: refuse-manual-stop.patch
1010
License: GPLv2+
@@ -166,6 +166,8 @@ make %{?_smp_mflags} check
166166
%{python3_sitelib}/*
167167

168168
%changelog
169+
* Tue Mar 15 2022 Muhammad Falak <[email protected]> - 3.0-14
170+
- Bump release to force rebuild with golang 1.16.15
169171
* Fri Feb 18 2022 Thomas Crain <[email protected]> - 3.0-13
170172
- Bump release to force rebuild with golang 1.16.14
171173
* Tue Feb 01 2022 Max Brodeur-Urbas <[email protected]> - 3.0-12
@@ -225,4 +227,4 @@ make %{?_smp_mflags} check
225227
* Wed Dec 09 2015 Anish Swaminathan <[email protected]> 2.4.4-2
226228
- Add systemd requirement.
227229
* Fri Aug 28 2015 Divya Thaluru <[email protected]> 2.4.4-1
228-
- Initial version
230+
- Initial version

‎SPECS/bind/bind.signatures.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"bind-9.16.22.tar.xz": "65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061"
3+
"bind-9.16.27.tar.xz": "90902aaf104c81019d75d6f8b2f7ec40fcd249406f894b44e4a9c6b5e08bf566"
44
}
5-
}
5+
}

‎SPECS/bind/bind.spec

+62-41
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: Domain Name System software
22
Name: bind
3-
Version: 9.16.22
3+
Version: 9.16.27
44
Release: 1%{?dist}
55
License: ISC
66
URL: https://www.isc.org/downloads/bind/
@@ -84,43 +84,64 @@ fi
8484
%{_prefix}/lib/tmpfiles.d/named.conf
8585

8686
%changelog
87-
* Tue Nov 09 2021 Nick Samson <[email protected]> - 9.16.22-1
88-
- Upgrade to 9.16.22, fixing CVE-2021-25219. Removed file entries removed from source build. Removed unnecessary patch files.
89-
* Wed May 12 2021 Andrew Phelps <[email protected]> - 9.16.15-1
90-
- Update version to 9.16.15 to fix CVE-2021-25215
91-
* Mon Mar 01 2021 Nicolas Guibourge <[email protected]> - 9.16.3-3
92-
- Fixes CVE-2020-8625
93-
* Fri Sep 11 2020 Ruying Chen <[email protected]> - 9.16.3-2
94-
- Fixes CVE-2020-8618, CVE-2020-8619, CVE-2020-8620,
95-
- CVE-2020-8621, CVE-2020-8622, CVE-2020-8623, CVE-2020-8624
96-
* Wed May 27 2020 Daniel McIlvaney <[email protected]> - 9.16.3-1
97-
- Update to version 9.16.3, fixes CVE-2018-5743, CVE-2018-5744, CVE-2019-6465, CVE-2019-6467, CVE-2019-6471, CVE-2020-8616, CVE-2020-8617
98-
* Sat May 09 2020 Nick Samson <[email protected]> - 9.13.3-4
99-
- Added %%license line automatically
100-
* Fri May 1 2020 Emre Girgin <[email protected]> 9.13.3-3
101-
- Renaming bindutils to bind.
102-
- Add bind-utils subpackage.
103-
* Tue Sep 03 2019 Mateusz Malisz <[email protected]> 9.13.3-2
104-
- Initial CBL-Mariner import from Photon (license: Apache2).
105-
* Sun Sep 23 2018 Sujay G <[email protected]> 9.13.3-1
106-
- Bump bindutils version to 9.13.3
107-
* Mon Feb 12 2018 Xiaolin Li <[email protected]> 9.10.6-1
108-
- Upgrading version to 9.10.6-P1, fix CVE-2017-3145
109-
* Mon Sep 18 2017 Alexey Makhalov <[email protected]> 9.10.4-4
110-
- Remove shadow from requires and use explicit tools for post actions
111-
* Fri Apr 14 2017 Kumar Kaushik <[email protected]> 9.10.4-3
112-
- Upgrading version to 9.10.4-P8
113-
* Mon Nov 21 2016 Priyesh Padmavilasom <[email protected]> 9.10.4-2
114-
- add shadow to requires
115-
* Mon Jun 06 2016 Harish Udaiya Kumar <[email protected]> 9.10.4-1
116-
- Upgraded the version to 9.10.4
117-
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 9.10.3-3
118-
- GA - Bump release of all rpms
119-
* Fri Apr 29 2016 Xiaolin Li <[email protected]> 9.10.3-2
120-
- Add group named and user named
121-
* Thu Jan 21 2016 Xiaolin Li <[email protected]> 9.10.3-1
122-
- Updated to version 9.10.3
123-
* Tue Aug 11 2015 Divya Thaluru <[email protected]> 9.10.1-1
124-
- Fixing release
125-
* Tue Jan 20 2015 Divya Thaluru <[email protected]> 9.10.1-P1
126-
- Initial build. First version
87+
* Thu Mar 17 2022 Muhammad Falak <[email protected]> - 9.16.27-1
88+
- Bump version to 9.16.27 to address CVE-2021-25220 & CVE-2022-0396
89+
90+
* Tue Nov 09 2021 Nick Samson <[email protected]> - 9.16.22-1
91+
- Upgrade to 9.16.22, fixing CVE-2021-25219. Removed file entries removed from source build. Removed unnecessary patch files.
92+
93+
* Wed May 12 2021 Andrew Phelps <[email protected]> - 9.16.15-1
94+
- Update version to 9.16.15 to fix CVE-2021-25215
95+
96+
* Mon Mar 01 2021 Nicolas Guibourge <[email protected]> - 9.16.3-3
97+
- Fixes CVE-2020-8625
98+
99+
* Fri Sep 11 2020 Ruying Chen <[email protected]> - 9.16.3-2
100+
- Fixes CVE-2020-8618, CVE-2020-8619, CVE-2020-8620,
101+
- CVE-2020-8621, CVE-2020-8622, CVE-2020-8623, CVE-2020-8624
102+
103+
* Wed May 27 2020 Daniel McIlvaney <[email protected]> - 9.16.3-1
104+
- Update to version 9.16.3, fixes CVE-2018-5743, CVE-2018-5744, CVE-2019-6465, CVE-2019-6467, CVE-2019-6471, CVE-2020-8616, CVE-2020-8617
105+
106+
* Sat May 09 2020 Nick Samson <[email protected]> - 9.13.3-4
107+
- Added %%license line automatically
108+
109+
* Fri May 1 2020 Emre Girgin <[email protected]> 9.13.3-3
110+
- Renaming bindutils to bind.
111+
- Add bind-utils subpackage.
112+
113+
* Tue Sep 03 2019 Mateusz Malisz <[email protected]> 9.13.3-2
114+
- Initial CBL-Mariner import from Photon (license: Apache2).
115+
116+
* Sun Sep 23 2018 Sujay G <[email protected]> 9.13.3-1
117+
- Bump bindutils version to 9.13.3
118+
119+
* Mon Feb 12 2018 Xiaolin Li <[email protected]> 9.10.6-1
120+
- Upgrading version to 9.10.6-P1, fix CVE-2017-3145
121+
122+
* Mon Sep 18 2017 Alexey Makhalov <[email protected]> 9.10.4-4
123+
- Remove shadow from requires and use explicit tools for post actions
124+
125+
* Fri Apr 14 2017 Kumar Kaushik <[email protected]> 9.10.4-3
126+
- Upgrading version to 9.10.4-P8
127+
128+
* Mon Nov 21 2016 Priyesh Padmavilasom <[email protected]> 9.10.4-2
129+
- add shadow to requires
130+
131+
* Mon Jun 06 2016 Harish Udaiya Kumar <[email protected]> 9.10.4-1
132+
- Upgraded the version to 9.10.4
133+
134+
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 9.10.3-3
135+
- GA - Bump release of all rpms
136+
137+
* Fri Apr 29 2016 Xiaolin Li <[email protected]> 9.10.3-2
138+
- Add group named and user named
139+
140+
* Thu Jan 21 2016 Xiaolin Li <[email protected]> 9.10.3-1
141+
- Updated to version 9.10.3
142+
143+
* Tue Aug 11 2015 Divya Thaluru <[email protected]> 9.10.1-1
144+
- Fixing release
145+
146+
* Tue Jan 20 2015 Divya Thaluru <[email protected]> 9.10.1-P1
147+
- Initial build. First version

‎SPECS/blobfuse/blobfuse.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: FUSE adapter - Azure Storage Blobs
22
Name: blobfuse
33
Version: 1.3.6
4-
Release: 7%{?dist}
4+
Release: 8%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
4747
%{_bindir}/blobfuse
4848

4949
%changelog
50+
* Tue Mar 15 2022 Muhammad Falak <[email protected]> - 1.3.6-8
51+
- Bump release to force rebuild with golang 1.16.15
52+
5053
* Fri Feb 18 2022 Thomas Crain <[email protected]> - 1.3.6-7
5154
- Bump release to force rebuild with golang 1.16.14
5255

‎SPECS/cloud-init/apply-netconfig-every-boot.patch

-42
This file was deleted.

‎SPECS/cloud-init/azureds-set-ovf_is_accesible.patch

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From 0988fb89be06aeb08083ce609f755509d08fa459 Mon Sep 17 00:00:00 2001
2+
From: Chris Patterson <[email protected]>
3+
Date: Tue, 18 Jan 2022 15:45:59 -0500
4+
Subject: [PATCH] sources/azure: set ovf_is_accessible when OVF is read
5+
successfully (#1193)
6+
7+
The if-statement set ovf_is_accessible to True if the OVF is read
8+
from /dev/sr0, but not from other data sources. It defaults to
9+
True, but may get flipped to False while processing an invalid
10+
source, and never get set back to True when reading from the data
11+
directory.
12+
13+
Instead, default ovf_is_accessible to False, and only set it to
14+
True once we've read an OVF successfully (and end the search).
15+
16+
This fixes an error when OVF is read from data_dir and IMDS
17+
data is unavailable (failing with "No OVF or IMDS available").
18+
19+
[Backport to 21.4]
20+
Signed-off-by: Anirudh Gopal <[email protected]>
21+
---
22+
cloudinit/sources/DataSourceAzure.py | 5 ++---
23+
1 file changed, 2 insertions(+), 3 deletions(-)
24+
25+
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
26+
index 93493fa0..3ff043da 100755
27+
--- a/cloudinit/sources/DataSourceAzure.py
28+
+++ b/cloudinit/sources/DataSourceAzure.py
29+
@@ -429,7 +429,7 @@ class DataSourceAzure(sources.DataSource):
30+
# the candidate list determines the path to take in order to get the
31+
# metadata we need.
32+
reprovision = False
33+
- ovf_is_accessible = True
34+
+ ovf_is_accessible = False
35+
reprovision_after_nic_attach = False
36+
metadata_source = None
37+
ret = None
38+
@@ -459,9 +459,9 @@ class DataSourceAzure(sources.DataSource):
39+
ret = util.mount_cb(src, load_azure_ds_dir)
40+
# save the device for ejection later
41+
self.iso_dev = src
42+
- ovf_is_accessible = True
43+
else:
44+
ret = load_azure_ds_dir(src)
45+
+ ovf_is_accessible = True
46+
metadata_source = src
47+
break
48+
except NonAzureDataSource:
49+
@@ -473,7 +473,6 @@ class DataSourceAzure(sources.DataSource):
50+
report_diagnostic_event(
51+
'%s was not mountable' % src,
52+
logger_func=LOG.debug)
53+
- ovf_is_accessible = False
54+
empty_md = {'local-hostname': ''}
55+
empty_cfg = dict(
56+
system_info=dict(
57+
--
58+
2.17.1
59+

‎SPECS/cloud-init/cloud-init.signatures.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"10-azure-kvp.cfg": "79e0370c010be5cd4717960e4b414570c9ec6e6d29aede77ccecc43d2b03bb9a",
4-
"cloud-init-21.3.tar.gz": "bab5b99567eae216eb44b11e7a358055b563a2585de3b7ead94936118b9f374a",
4+
"cloud-init-21.4.tar.gz": "c8b74593070fee58fe6b497941f6da4d13357e936e49248e4ba3999465e1fdd2",
55
"dscheck_VMwareGuestInfo": "8ec3db577c749accff961cd3e723b312cf2bbc41473f2e164c76332fb972f73c"
66
}
77
}

‎SPECS/cloud-init/cloud-init.spec

+17-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
%define cl_services cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
33
Summary: Cloud instance init scripts
44
Name: cloud-init
5-
Version: 21.3
6-
Release: 4%{?dist}
5+
Version: 21.4
6+
Release: 2%{?dist}
77
License: GPLv3
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -16,10 +16,11 @@ Patch0: cloud-init-azureds.patch
1616
Patch1: ds-identify.patch
1717
Patch2: ds-vmware-mariner.patch
1818
Patch3: cloud-cfg.patch
19-
Patch4: networkd.patch
20-
Patch5: mariner.patch
21-
Patch6: update-metadata-on-BOOT_NEW_INSTANCE.patch
22-
Patch7: apply-netconfig-every-boot.patch
19+
# Add Mariner distro support to cloud-init
20+
Patch4: mariner-21.4.patch
21+
# backport patch https://github.com/canonical/cloud-init/commit/0988fb89be06aeb08083ce609f755509d08fa459.patch to 21.4
22+
Patch5: azureds-set-ovf_is_accesible.patch
23+
2324
BuildRequires: automake
2425
BuildRequires: dbus
2526
BuildRequires: iproute
@@ -74,6 +75,7 @@ ssh keys and to let the user run various scripts.
7475
%package azure-kvp
7576
Summary: Cloud-init configuration for Hyper-V telemetry
7677
Requires: %{name} = %{version}-%{release}
78+
7779
%description azure-kvp
7880
Cloud-init configuration for Hyper-V telemetry
7981

@@ -153,13 +155,21 @@ rm -rf %{buildroot}
153155
%{_unitdir}/*
154156
%{_systemdgeneratordir}/cloud-init-generator
155157
%{_udevrulesdir}/66-azure-ephemeral.rules
156-
%{_udevrulesdir}/10-cloud-init-hook-hotplug.rules
158+
%{_sysconfdir}/systemd/system/[email protected]/disable-sshd-keygen-if-cloud-init-active.conf
157159
%{_datadir}/bash-completion/completions/cloud-init
158160

159161
%files azure-kvp
160162
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/10-azure-kvp.cfg
161163

162164
%changelog
165+
* Tue Mar 22 2022 Anirudh Gopal <[email protected]> - 21.4-2
166+
- Backport cloud-init ovf_is_accessible DataSourceAzure.py fix to 21.4
167+
168+
* Wed Mar 16 2022 Henry Beberman <[email protected]> - 21.4-1
169+
- Update to version 21.4
170+
- Remove several upstreamed patches already present in source
171+
- Add netplan support into the Mariner distro config
172+
163173
* Tue Feb 22 2022 Henry Beberman <[email protected]> - 21.3-4
164174
- Add patches from upstream to resolve a hang when reinitializing preprovisioned VMs.
165175

0 commit comments

Comments
 (0)