Skip to content

Commit e44fb2e

Browse files
authored
golang: drop golang-1.17 (#9877)
None of the packages have a dependency on golang-1.17. Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
1 parent 8539e10 commit e44fb2e

27 files changed

Lines changed: 111 additions & 298 deletions

File tree

SPECS-EXTENDED/nmi/nmi.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Node Managed Identity
33
Name: nmi
44
Version: 1.8.17
5-
Release: 3%{?dist}
5+
Release: 4%{?dist}
66
License: MIT
77
Vendor: Microsoft Corporation
88
Distribution: Mariner
@@ -26,7 +26,7 @@ Source0: %{name}-%{version}.tar.gz
2626
Source1: %{name}-%{version}-vendor-v2.tar.gz
2727
Patch0: modify-go-build-option.patch
2828
Patch1: CVE-2023-45288.patch
29-
BuildRequires: golang >= 1.15
29+
BuildRequires: golang
3030

3131
%description
3232
NMI is the resource that is used when your pods look to use their identity.
@@ -62,6 +62,9 @@ popd
6262
%{_bindir}/%{name}
6363

6464
%changelog
65+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 1.8.17-4
66+
- Drop requirement on a specific version of golang
67+
6568
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.8.17-3
6669
- Bump release to rebuild with go 1.21.11
6770

SPECS-EXTENDED/umoci/umoci.spec

Lines changed: 5 additions & 2 deletions
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: 15%{?dist}
4+
Release: 16%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -10,7 +10,7 @@ URL: https://github.com/opencontainers/umoci
1010
Source0: https://github.com/opencontainers/umoci/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1111
%global debug_package %{nil}
1212
%define our_gopath %{_topdir}/.gopath
13-
BuildRequires: golang >= 1.17.9
13+
BuildRequires: golang
1414

1515
%description
1616
umoci modifies Open Container images.
@@ -39,6 +39,9 @@ go test -mod=vendor
3939
%{_bindir}/umoci
4040

4141
%changelog
42+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 0.4.7-16
43+
- Drop requirement on a specific version of golang
44+
4245
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.4.7-15
4346
- Bump release to rebuild with go 1.21.11
4447

SPECS/KeysInUse-OpenSSL/KeysInUse-OpenSSL.spec

Lines changed: 5 additions & 2 deletions
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: 5%{?dist}
4+
Release: 6%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -10,7 +10,7 @@ URL: https://github.com/microsoft/KeysInUse-OpenSSL
1010
Source0: https://github.com/microsoft/KeysInUse-OpenSSL/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1111
BuildRequires: cmake
1212
BuildRequires: gcc
13-
BuildRequires: golang >= 1.16.6
13+
BuildRequires: golang
1414
BuildRequires: make
1515
BuildRequires: openssl-devel
1616
Requires: openssl < 1.1.2
@@ -74,6 +74,9 @@ if [ -x %{_bindir}/keysinuseutil ]; then
7474
fi
7575

7676
%changelog
77+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 0.3.4-6
78+
- Drop requirement on a specific version of golang
79+
7780
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.3.4-5
7881
- Bump release to rebuild with go 1.21.11
7982

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,6 @@
27132713
"gnutls",
27142714
"gobject-introspection",
27152715
"golang",
2716-
"golang-1.17",
27172716
"golang-1.18",
27182717
"gperf",
27192718
"gperftools",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Application Gateway Ingress Controller
33
Name: application-gateway-kubernetes-ingress
44
Version: 1.4.0
5-
Release: 20%{?dist}
5+
Release: 21%{?dist}
66
License: MIT
77
Vendor: Microsoft Corporation
88
Distribution: Mariner
@@ -30,7 +30,7 @@ Patch0: CVE-2022-21698.patch
3030
Patch1: CVE-2023-44487.patch
3131
Patch2: CVE-2021-44716.patch
3232

33-
BuildRequires: golang >= 1.13
33+
BuildRequires: golang
3434
%if %{with_check}
3535
BuildRequires: helm
3636
%endif
@@ -67,6 +67,9 @@ cp appgw-ingress %{buildroot}%{_bindir}/
6767
%{_bindir}/appgw-ingress
6868

6969
%changelog
70+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 1.4.0-21
71+
- Drop requirement on a specific version of golang
72+
7073
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.4.0-20
7174
- Bump release to rebuild with go 1.21.11
7275

SPECS/azcopy/azcopy.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: The new Azure Storage data transfer utility - AzCopy v10
22
Name: azcopy
33
Version: 10.24.0
4-
Release: 2%{?dist}
4+
Release: 3%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -28,7 +28,7 @@ Source0: https://github.com/Azure/azure-storage-azcopy/archive/refs/tags/
2828
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
2929
Source1: azure-storage-%{name}-%{version}-vendor.tar.gz
3030

31-
BuildRequires: golang >= 1.19
31+
BuildRequires: golang
3232
BuildRequires: git
3333
%global debug_package %{nil}
3434
%define our_gopath %{_topdir}/.gopath
@@ -63,6 +63,9 @@ go test -mod=vendor
6363
%{_bindir}/azcopy
6464

6565
%changelog
66+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 10.24.0-3
67+
- Drop requirement on a specific version of golang
68+
6669
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.24.0-2
6770
- Bump release to rebuild with go 1.21.11
6871

SPECS/blobfuse2/blobfuse2.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: FUSE adapter - Azure Storage
88
Name: blobfuse2
99
Version: %{blobfuse2_version}
10-
Release: 4%{?dist}
10+
Release: 5%{?dist}
1111
License: MIT
1212
Vendor: Microsoft Corporation
1313
Distribution: Mariner
@@ -39,7 +39,7 @@ Patch0: CVE-2023-45288.patch
3939
BuildRequires: cmake
4040
BuildRequires: fuse3-devel
4141
BuildRequires: gcc
42-
BuildRequires: golang >= 1.16
42+
BuildRequires: golang
4343
Requires: fuse3
4444

4545
%description
@@ -80,6 +80,9 @@ install -D -m 0644 ./setup/blobfuse2-logrotate %{buildroot}%{_sysconfdir}/logrot
8080
%{_sysconfdir}/logrotate.d/blobfuse2
8181

8282
%changelog
83+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 2.1.2-5
84+
- Drop requirement on a specific version of golang
85+
8386
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.1.2-4
8487
- Bump release to rebuild with go 1.21.11
8588

SPECS/cf-cli/cf-cli.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: The official command line client for Cloud Foundry.
22
Name: cf-cli
33
Version: 8.4.0
4-
Release: 17%{?dist}
4+
Release: 18%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -30,7 +30,7 @@ Source1: cli-%{version}-vendor.tar.gz
3030
Patch0: CVE-2023-44487.patch
3131
Patch1: CVE-2021-44716.patch
3232

33-
BuildRequires: golang >= 1.18.3
33+
BuildRequires: golang
3434
%global debug_package %{nil}
3535
%define our_gopath %{_topdir}/.gopath
3636

@@ -63,6 +63,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} ./out/cf
6363
%{_bindir}/cf
6464

6565
%changelog
66+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 8.4.0-18
67+
- Drop requirement on a specific version of golang
68+
6669
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 8.4.0-17
6770
- Bump release to rebuild with go 1.21.11
6871

SPECS/cni-plugins/cni-plugins.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Container Network Interface (CNI) plugins
22
Name: cni-plugins
33
Version: 1.3.0
4-
Release: 3%{?dist}
4+
Release: 4%{?dist}
55
License: ASL 2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -11,7 +11,7 @@ URL: https://github.com/containernetworking/plugins
1111
#Source0: https://github.com/containernetworking/plugins/archive/v%{version}.tar.gz
1212
Source0: %{name}-%{version}.tar.gz
1313
%define _default_cni_plugins_dir /opt/cni/bin
14-
BuildRequires: golang >= 1.5
14+
BuildRequires: golang
1515
Provides: kubernetes-cni
1616

1717
%description
@@ -39,6 +39,9 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
3939
%{_default_cni_plugins_dir}/*
4040

4141
%changelog
42+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 1.3.0-4
43+
- Drop requirement on a specific version of golang
44+
4245
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.3.0-3
4346
- Bump release to rebuild with go 1.21.11
4447

0 commit comments

Comments
 (0)