From 9bab37fbc72e58672fa20c6ec97f1ab04da4ab14 Mon Sep 17 00:00:00 2001 From: hanchao Date: Mon, 21 Nov 2022 16:16:55 +0800 Subject: [PATCH] golang: remove hard code and strong dependency of git, subversion and mercurial --- golang.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/golang.spec b/golang.spec index 3e881f4..62640cc 100644 --- a/golang.spec +++ b/golang.spec @@ -7,6 +7,7 @@ %global __spec_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot /usr/lib/rpm/brp-compress %global __requires_exclude_from ^(%{_datadir}|/usr/lib)/%{name}/(doc|src)/.*$ %global __strip /bin/true +%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} %define _use_internal_dependency_generator 0 %define __find_requires %{nil} @@ -62,7 +63,7 @@ Name: golang Version: 1.17.3 -Release: 11 +Release: 12 Summary: The Go Programming Language License: BSD and Public Domain URL: https://golang.org/ @@ -91,7 +92,7 @@ Obsoletes: %{name}-cover < 0-12.1 Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives -Requires: glibc gcc git subversion +Recommends: glibc gcc git subversion # generated by: @@ -147,7 +148,7 @@ Obsoletes: %{name}-docs Obsoletes: %{name}-data < 1.1.1-4 Obsoletes: %{name}-vim < 1.4 Obsoletes: emacs-%{name} < 1.4 -Requires: openEuler-rpm-config +Requires: %{vendor}-rpm-config Patch6001: 0001-release-branch.go1.17-crypto-elliptic-tolerate-zero-.patch Patch6002: 0002-release-branch.go1.17-encoding-pem-fix-stack-overflo.patch @@ -410,6 +411,12 @@ fi %files devel -f go-tests.list -f go-misc.list -f go-src.list %changelog +* Fri Oct 11 2022 hanchao - 1.17.3-12 +- Type:CVE +- CVE:CVE-2022-41716 +- SUG:NA +- DESC: remove hard code and strong dependency of git, subversion and mercurial + * Fri Oct 11 2022 hanchao - 1.17.3-11 - Type:CVE - CVE:CVE-2022-41716 -- Gitee