Skip to content

Commit 614add1

Browse files
committed
Merge branch '1.0-dev' into 1.0
2 parents e72e08f + 3147eec commit 614add1

File tree

95 files changed

+965
-248
lines changed

Some content is hidden

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

95 files changed

+965
-248
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.10.149.1
12+
Version: 5.10.153.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -147,6 +147,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
147147
%endif
148148

149149
%changelog
150+
* Tue Nov 08 2022 CBL-Mariner Servicing Account <[email protected]> - 5.10.153.1-1
151+
- Auto-upgrade to 5.10.153.1
152+
153+
* Tue Nov 01 2022 CBL-Mariner Servicing Account <[email protected]> - 5.10.152.1-1
154+
- Upgrade to 5.10.152.1
155+
150156
* Wed Oct 19 2022 CBL-Mariner Servicing Account <[email protected]> - 5.10.149.1-1
151157
- Upgrade to 5.10.149.1
152158

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,7 @@
761761
"python-zope-interface",
762762
"python2",
763763
"python3",
764+
"python3-twisted",
764765
"pytz",
765766
"PyYAML",
766767
"rapidjson",

SPECS/audit/audit.spec

Lines changed: 4 additions & 1 deletion
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: 17%{?dist}
7+
Release: 18%{?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,9 @@ make %{?_smp_mflags} check
166166
%{python3_sitelib}/*
167167

168168
%changelog
169+
* Tue Nov 01 2022 Olivia Crain <[email protected]> - 3.0-18
170+
- Bump release to rebuild with go 1.18.8
171+
169172
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 3.0-17
170173
- Bump to rebuild with golang 1.18.5-1
171174

SPECS/bind/bind.signatures.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Signatures": {
3-
"bind-9.16.27.tar.xz": "90902aaf104c81019d75d6f8b2f7ec40fcd249406f894b44e4a9c6b5e08bf566"
4-
}
2+
"Signatures": {
3+
"bind-9.16.33.tar.xz": "ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91"
4+
}
55
}

SPECS/bind/bind.spec

Lines changed: 4 additions & 1 deletion
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.27
3+
Version: 9.16.33
44
Release: 1%{?dist}
55
License: ISC
66
URL: https://www.isc.org/downloads/bind/
@@ -84,6 +84,9 @@ fi
8484
%{_prefix}/lib/tmpfiles.d/named.conf
8585

8686
%changelog
87+
* Mon Nov 14 2022 CBL-Mariner Servicing Account <[email protected]> - 9.16.33-1
88+
- Auto-upgrade to 9.16.33 - CVE-2022-2795,CVE-2022-3080
89+
8790
* Thu Mar 17 2022 Muhammad Falak <[email protected]> - 9.16.27-1
8891
- Bump version to 9.16.27 to address CVE-2021-25220 & CVE-2022-0396
8992

SPECS/blobfuse/blobfuse.spec

Lines changed: 4 additions & 1 deletion
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: 11%{?dist}
4+
Release: 12%{?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 Nov 01 2022 Olivia Crain <[email protected]> - 1.3.6-12
51+
- Bump release to rebuild with go 1.18.8
52+
5053
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.3.6-11
5154
- Bump to rebuild with golang 1.18.5-1
5255

SPECS/cni/cni.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Container Network Interface (CNI) plugins
44
Name: cni
55
Version: 0.9.1
6-
Release: 8%{?dist}
6+
Release: 9%{?dist}
77
License: ASL 2.0
88
URL: https://github.com/containernetworking/plugins
99
#Source0: https://github.com/containernetworking/plugins/archive/refs/tags/v0.9.1.tar.gz
@@ -42,6 +42,9 @@ install -vpm 0755 -t %{buildroot}%{_default_cni_plugins_dir} bin/*
4242
%{_default_cni_plugins_dir}/*
4343

4444
%changelog
45+
* Tue Nov 01 2022 Olivia Crain <[email protected]> - 0.9.1-9
46+
- Bump release to rebuild with go 1.18.8
47+
4548
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 0.9.1-8
4649
- Bump to rebuild with golang 1.18.5-1
4750

SPECS/coredns/coredns-1.8.0.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.8.0
6-
Release: 8%{?dist}
6+
Release: 9%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
6161
%{_bindir}/%{name}
6262

6363
%changelog
64+
* Tue Nov 01 2022 Olivia Crain <[email protected]> - 1.8.0-9
65+
- Bump release to rebuild with go 1.18.8
66+
6467
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.8.0-8
6568
- Bump to rebuild with golang 1.18.5-1
6669

SPECS/coredns/coredns-1.8.4.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.8.4
6-
Release: 7%{?dist}
6+
Release: 8%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
6161
%{_bindir}/%{name}
6262

6363
%changelog
64+
* Tue Nov 01 2022 Olivia Crain <[email protected]> - 1.8.4-8
65+
- Bump release to rebuild with go 1.18.8
66+
6467
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.8.4-7
6568
- Bump to rebuild with golang 1.18.5-1
6669

0 commit comments

Comments
 (0)