Skip to content

Commit

Permalink
Upgraded golang version 1.20.10 -> 1.21.6 (#7640)
Browse files Browse the repository at this point in the history
Changelog: https://go.dev/doc/devel/release#go1.21.0
Signed-off-by: Muhammad Falak R Wani <[email protected]>
Co-authored-by: Pawel Winogrodzki <[email protected]>
  • Loading branch information
mfrw and PawelWMS authored Feb 9, 2024
1 parent 1add496 commit bd9a5c7
Show file tree
Hide file tree
Showing 49 changed files with 191 additions and 52 deletions.
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/buildah/buildah.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Summary: A command line tool used for creating OCI Images
Name: buildah
Version: 1.18.0
Release: 21%{?dist}
Release: 22%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
%{_datadir}/%{name}/test

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.18.0-22
- Bump release to rebuild with go 1.21.6

* Wed Oct 18 2023 Minghe Ren <[email protected]> - 1.18.0-21
- Bump release to rebuild against glibc 2.35-6

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

Name: %{project}-%{repo}
Version: 1.1.1
Release: 13%{?dist}
Release: 14%{?dist}
Summary: Libraries for writing CNI plugin
License: ASL 2.0 and BSD and MIT
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -129,6 +129,9 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
%{_unitdir}/cni-dhcp.socket

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.1.1-14
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.1.1-13
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/delve/delve.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Name: delve
Version: 1.5.0
Release: 16%{?dist}
Release: 17%{?dist}
Summary: A debugger for the Go programming language

License: MIT
Expand Down Expand Up @@ -72,6 +72,9 @@ done


%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.5.0-17
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.5.0-16
- Bump release to rebuild with go 1.20.9

Expand Down
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/podman/podman.signatures.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Signatures": {
"dnsname-18822f9.tar.gz": "c78995a745981fc62a6af579ba416304538e3cba7267d6c06b926a9f4bcd8db9",
"gvisor-tap-vsock-aab0ac9.tar.gz": "e833d0a4506a02c8462ebfe34c48542e8142ddce0ab00277252450e6f42271ae",
"gvisor-tap-vsock-012bc90.tar.gz": "c9b9c43ca4972fb49e2c098cbbe28aa26bb6fc10d5b642032dcc40005f06a26c",
"podman-4.1.1.tar.gz": "27bf32e9b1afee94cb08ebd59389104788d687f402a541f3631f94c7916b10a5"
}
}
8 changes: 6 additions & 2 deletions SPECS-EXTENDED/podman/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
# https://github.com/containers/gvisor-tap-vsock
%global import_path_gvproxy %%{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
%global git_gvproxy https://%{import_path_gvproxy}
%global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
%global commit_gvproxy 012bc90eed47444b08986d56ffd65b0f68cfff20
%global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7})

%global built_tag v4.1.1

Name: podman
Version: 4.1.1
Release: 18%{?dist}
Release: 19%{?dist}
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
Summary: Manage Pods, Containers and Container Images
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -387,6 +387,10 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/

# rhcontainerbot account currently managed by lsm5
%changelog
* Fri Feb 02 2024 Muhammad Falak <[email protected]> - 4.1.1-19
- Bump release to rebuild with go 1.21.6
- Bump version of gvproxy to enable build with go1.21

* Wed Oct 18 2023 Minghe Ren <[email protected]> - 4.1.1-18
- Bump release to rebuild against glibc 2.35-6

Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/umoci/umoci.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Open Container Image manipulation tool
Name: umoci
Version: 0.4.7
Release: 13%{?dist}
Release: 14%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -39,6 +39,9 @@ go test -mod=vendor
%{_bindir}/umoci

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 0.4.7-14
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.4.7-13
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/KeysInUse-OpenSSL/KeysInUse-OpenSSL.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: The KeysInUse Engine for OpenSSL allows the logging of private key usage through OpenSSL
Name: KeysInUse-OpenSSL
Version: 0.3.4
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -74,6 +74,9 @@ if [ -x %{_bindir}/keysinuseutil ]; then
fi

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 0.3.4-4
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.3.4-3
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/blobfuse/blobfuse.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: FUSE adapter - Azure Storage Blobs
Name: blobfuse
Version: 1.4.5
Release: 13%{?dist}
Release: 14%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -46,6 +46,9 @@ install -p -m 755 build/blobfuse %{buildroot}%{_bindir}/
%{_bindir}/blobfuse

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.4.5-14
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.4.5-13
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/blobfuse2/blobfuse2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: FUSE adapter - Azure Storage
Name: blobfuse2
Version: %{blobfuse2_version}
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -80,6 +80,9 @@ install -D -m 0644 ./setup/blobfuse2-logrotate %{buildroot}%{_sysconfdir}/logrot
%{_sysconfdir}/logrotate.d/blobfuse2

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 2.1.2-2
- Bump release to rebuild with go 1.21.6

* Fri Nov 17 2023 Anubhuti Shruti <[email protected]> - 2.1.2-1
- Bump version to 2.1.2

Expand Down
5 changes: 4 additions & 1 deletion SPECS/cert-manager/cert-manager.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Automatically provision and manage TLS certificates in Kubernetes
Name: cert-manager
Version: 1.11.2
Release: 7%{?dist}
Release: 8%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -112,6 +112,9 @@ install -D -m0755 bin/webhook %{buildroot}%{_bindir}/
%{_bindir}/webhook

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.11.2-8
- Bump release to rebuild with go 1.21.6

* Fri Jan 18 2024 Tobias Brick <[email protected]> - 1.11.2-7
- Patch for CVE-2023-48795

Expand Down
5 changes: 4 additions & 1 deletion SPECS/cni-plugins/cni-plugins.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Container Network Interface (CNI) plugins
Name: cni-plugins
Version: 1.3.0
Release: 1%{?dist}
Release: 2%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -39,6 +39,9 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
%{_default_cni_plugins_dir}/*

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.3.0-2
- Bump release to rebuild with go 1.21.6

* Wed Oct 18 2023 Mateusz Gozdek <[email protected]> - 1.3.0-1
- Make plugin binaries correctly print version
- Upgrade to version 1.3.0
Expand Down
5 changes: 4 additions & 1 deletion SPECS/cni/cni.spec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Summary: Container Network Interface - networking for Linux containers
Name: cni
Version: 1.0.1
Release: 15%{?dist}
Release: 16%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -113,6 +113,9 @@ install -m 755 -d "%{buildroot}%{cni_doc_dir}"
%{_sbindir}/cnitool

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.0.1-16
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.0.1-15
- Bump release to rebuild with go 1.20.9

Expand Down
7 changes: 5 additions & 2 deletions SPECS/coredns/coredns.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Summary: Fast and flexible DNS server
Name: coredns
Version: 1.11.1
Release: 4%{?dist}
Release: 5%{?dist}
License: Apache License 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -71,9 +71,12 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
%{_bindir}/%{name}

%changelog
* Fri Feb 10 2024 Mykhailo Bykhovtsev <[email protected]> - 1.11.1-4
* Fri Feb 10 2024 Mykhailo Bykhovtsev <[email protected]> - 1.11.1-5
- patched vendored quic-go package to address CVE-2023-49295

* Thu Feb 08 2024 Muhammad Falak <[email protected]> - 1.11.1-4
- Bump release to rebuild with go 1.21.6

* Mon Feb 05 2024 Daniel McIlvaney <[email protected]> - 1.11.1-3
- Refactor vendor patch application
- Force vendored components during test
Expand Down
5 changes: 4 additions & 1 deletion SPECS/cri-o/cri-o.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Summary: OCI-based implementation of Kubernetes Container Runtime Interfa
# Define macros for further referenced sources
Name: cri-o
Version: 1.21.2
Release: 18%{?dist}
Release: 19%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -203,6 +203,9 @@ mkdir -p /opt/cni/bin
%{_fillupdir}/sysconfig.kubelet

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.21.2-19
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.21.2-18
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/cri-tools/cri-tools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: CRI tools
Name: cri-tools
Version: 1.28.0
Release: 3%{?dist}
Release: 4%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -44,6 +44,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} "${BUILD_FOLDER}/critest"
%{_bindir}/critest

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.28.0-4
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.28.0-3
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/dcos-cli/dcos-cli.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: The command line for DC/OS
Name: dcos-cli
Version: 1.2.0
Release: 14%{?dist}
Release: 15%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -45,6 +45,9 @@ go test -mod=vendor
%{_bindir}/dcos

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 1.2.0-15
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 1.2.0-14
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/etcd/etcd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Summary: A highly-available key value store for shared configuration
Name: etcd
Version: 3.5.9
Release: 1%{?dist}
Release: 2%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -145,6 +145,9 @@ install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
/%{_docdir}/%{name}-%{version}-tools/*

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 3.5.9-2
- Bump release to rebuild with go 1.21.6

* Tue Oct 18 2023 Nicolas Guibourge <[email protected]> - 3.5.9-1
- Upgrade to 3.5.9 to match version required by kubernetes

Expand Down
5 changes: 4 additions & 1 deletion SPECS/gh/gh.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: GitHub official command line tool
Name: gh
Version: 2.13.0
Release: 16%{?dist}
Release: 17%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -72,6 +72,9 @@ make test
%{_datadir}/zsh/site-functions/_gh

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 2.13.0-17
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 2.13.0-16
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/glide/glide.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Vendor Package Management for Golang
Name: glide
Version: 0.13.3
Release: 24%{?dist}
Release: 25%{?dist}
License: MIT
URL: https://github.com/Masterminds/glide
# Source0: https://github.com/Masterminds/%{name}/archive/v%{version}.tar.gz
Expand Down Expand Up @@ -53,6 +53,9 @@ popd
%{_bindir}/glide

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 0.13.3-25
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 0.13.3-24
- Bump release to rebuild with go 1.20.9

Expand Down
5 changes: 4 additions & 1 deletion SPECS/go-md2man/go-md2man.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Converts markdown into roff (man pages)
Name: go-md2man
Version: 2.0.1
Release: 21%{?dist}
Release: 22%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -48,6 +48,9 @@ cp go-md2man-%{version}/LICENSE.md %{buildroot}%{_docdir}/%{name}-%{version}/LIC
%{_bindir}/go-md2man

%changelog
* Fri Feb 02 2024 CBL-Mariner Servicing Account <[email protected]> - 2.0.1-22
- Bump release to rebuild with go 1.21.6

* Mon Oct 16 2023 CBL-Mariner Servicing Account <[email protected]> - 2.0.1-21
- Bump release to rebuild with go 1.20.9

Expand Down
Loading

0 comments on commit bd9a5c7

Please sign in to comment.