Skip to content

Commit 6cbcb96

Browse files
committed
Merge branch 'main' into 2.0
2 parents 57a627b + a351e45 commit 6cbcb96

File tree

110 files changed

+840
-2438
lines changed

Some content is hidden

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

110 files changed

+840
-2438
lines changed

SPECS-EXTENDED/buildah/buildah.spec

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Summary: A command line tool used for creating OCI Images
2222
Name: buildah
2323
Version: 1.18.0
24-
Release: 20%{?dist}
24+
Release: 21%{?dist}
2525
License: ASL 2.0
2626
Vendor: Microsoft Corporation
2727
Distribution: Mariner
@@ -123,9 +123,12 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
123123
%{_datadir}/%{name}/test
124124

125125
%changelog
126-
* Wed Oct 11 2023 Minghe Ren <[email protected]> - 1.18.0-20
126+
* Wed Oct 18 2023 Minghe Ren <[email protected]> - 1.18.0-21
127127
- Bump release to rebuild against glibc 2.35-6
128128

129+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.18.0-20
130+
- Bump release to rebuild with go 1.20.10
131+
129132
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.18.0-19
130133
- Bump release to rebuild with updated version of Go.
131134

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
Name: %{project}-%{repo}
2626
Version: 1.1.1
27-
Release: 12%{?dist}
27+
Release: 13%{?dist}
2828
Summary: Libraries for writing CNI plugin
2929
License: ASL 2.0 and BSD and MIT
3030
Vendor: Microsoft Corporation
@@ -129,6 +129,9 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
129129
%{_unitdir}/cni-dhcp.socket
130130

131131
%changelog
132+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.1.1-13
133+
- Bump release to rebuild with go 1.20.10
134+
132135
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.1.1-12
133136
- Bump release to rebuild with updated version of Go.
134137

SPECS-EXTENDED/delve/delve.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
22
Distribution: Mariner
33
Name: delve
44
Version: 1.5.0
5-
Release: 15%{?dist}
5+
Release: 16%{?dist}
66
Summary: A debugger for the Go programming language
77

88
License: MIT
@@ -72,6 +72,9 @@ done
7272

7373

7474
%changelog
75+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.5.0-16
76+
- Bump release to rebuild with go 1.20.10
77+
7578
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 1.5.0-15
7679
- Bump release to rebuild with updated version of Go.
7780

SPECS-EXTENDED/podman/podman.spec

+5-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
Name: podman
3838
Version: 4.1.1
39-
Release: 17%{?dist}
39+
Release: 18%{?dist}
4040
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
4141
Summary: Manage Pods, Containers and Container Images
4242
Vendor: Microsoft Corporation
@@ -387,9 +387,12 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
387387

388388
# rhcontainerbot account currently managed by lsm5
389389
%changelog
390-
* Wed Oct 11 2023 Minghe Ren <[email protected]> - 4.1.1-17
390+
* Wed Oct 18 2023 Minghe Ren <[email protected]> - 4.1.1-18
391391
- Bump release to rebuild against glibc 2.35-6
392392

393+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 4.1.1-17
394+
- Bump release to rebuild with go 1.20.10
395+
393396
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 4.1.1-16
394397
- Bump release to rebuild with updated version of Go.
395398

SPECS-EXTENDED/umoci/umoci.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Open Container Image manipulation tool
22
Name: umoci
33
Version: 0.4.7
4-
Release: 12%{?dist}
4+
Release: 13%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -39,6 +39,9 @@ go test -mod=vendor
3939
%{_bindir}/umoci
4040

4141
%changelog
42+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.4.7-13
43+
- Bump release to rebuild with go 1.20.10
44+
4245
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 0.4.7-12
4346
- Bump release to rebuild with updated version of Go.
4447

SPECS/KeysInUse-OpenSSL/KeysInUse-OpenSSL.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: The KeysInUse Engine for OpenSSL allows the logging of private key usage through OpenSSL
22
Name: KeysInUse-OpenSSL
33
Version: 0.3.4
4-
Release: 2%{?dist}
4+
Release: 3%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -74,6 +74,9 @@ if [ -x %{_bindir}/keysinuseutil ]; then
7474
fi
7575

7676
%changelog
77+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.3.4-3
78+
- Bump release to rebuild with go 1.20.10
79+
7780
* Tue Oct 10 2023 Dan Streetman <[email protected]> - 0.3.4-2
7881
- Bump release to rebuild with updated version of Go.
7982

SPECS/PyYAML/ConstructorError_fix.patch

-68
This file was deleted.

0 commit comments

Comments
 (0)