Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
bb9a6f61be
!19 Rebuild to fix CVE-2023-39326 CVE-2024-24789 CVE-2024-24791
From: @jxy_git 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2025-01-14 11:55:38 +00:00
jxy_git
ea413081ba Rebuild to fix CVE-2023-39326 CVE-2024-24789 CVE-2024-24791 2025-01-14 17:20:51 +08:00
openeuler-ci-bot
d6ea560f1a
!13 [sync] PR-12: Update package to version 0.15.0
From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
2023-09-08 06:07:59 +00:00
jxy_git
f82aad19a5 Update package to version 0.15.0
(cherry picked from commit 764bb6e23989ef8c07cc95c0554ea8fbde43ae1d)
2023-09-08 13:55:06 +08:00
openeuler-ci-bot
eb624969e7
!10 Add riscv64 support
From: @East_x 
Reviewed-by: @biannm 
Signed-off-by: @jianminw
2023-08-17 02:45:53 +00:00
EastDong
2ffbdfb3bf add riscv support 2023-06-14 19:53:14 +08:00
openeuler-ci-bot
dc54fb170e
!8 [sync] PR-7: remove linkmode external
From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
2023-03-21 01:24:47 +00:00
caodongxia
4248027edb remove linkmode external
(cherry picked from commit 1c1c86026d86b106c09d02f4944d096611112b9b)
2023-03-21 09:19:26 +08:00
openeuler-ci-bot
6eeb58b682
!5 [sync] PR-4: promu存在不安全的编译选项PIE、STRIP
From: @openeuler-sync-bot 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2023-03-07 05:44:03 +00:00
Wangjunqi123
20428742ad promu存在不安全的编译选项PIE、STRIP
(cherry picked from commit ab29e9dead5ff5595090bd90245c7ede849a104c)
2023-03-07 13:35:27 +08:00
5 changed files with 73 additions and 13 deletions

View File

@ -0,0 +1,34 @@
From b754346641b7875dc920c26dcf96a7541e5365ba Mon Sep 17 00:00:00 2001
From: jxy_git <jiangxinyu@kylinos.cn>
Date: Thu, 7 Sep 2023 16:02:54 +0800
Subject: [PATCH] add parameters to solve the strip
---
.promu.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.promu.yml b/.promu.yml
index 45081b8..d586c86 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -10,12 +10,11 @@ build:
windows: [static_build]
flags: -a
ldflags: |
- -s
- -X github.com/prometheus/common/version.Version={{.Version}}
- -X github.com/prometheus/common/version.Revision={{.Revision}}
- -X github.com/prometheus/common/version.Branch={{.Branch}}
- -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
- -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.Version={{.Version}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.Revision={{.Revision}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.Branch={{.Branch}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
tarball:
files:
- LICENSE
--
2.41.0

BIN
promu-0.15.0.tar.gz Normal file

Binary file not shown.

BIN
promu-vendor.tar.gz Normal file

Binary file not shown.

View File

@ -1,35 +1,61 @@
%define debug_package %{nil}
Name: promu
Version: 0.7.0
Release: 1
Summary: Prometheus Utility Tool
License: ASL 2.0
URL: https://github.com/prometheus/promu
Name: promu
Version: 0.15.0
Release: 2
Summary: Prometheus Utility Tool
License: Apache-2.0
URL: https://github.com/prometheus/promu
Source0: https://github.com/prometheus/promu/archive/refs/tags/v%{version}.tar.gz#/promu-0.15.0.tar.gz
# tar -xvf Source0
# run 'go mod vendor' in it
# tar -czvf promu-vendor.tar.gz vendor
Source1: promu-vendor.tar.gz
Patch0: add-parameters-to-solve-the-strip.patch
Source0: https://github.com/prometheus/promu/archive/v%{version}.tar.gz
BuildRequires: golang >= 1.14
BuildRequires: gcc
BuildRequires: golang >= 1.13
Conflicts: promu
Provides: %{name} = %{version}
Conflicts: promu
Provides: %{name} = %{version}-%{release}
%description
promu is the utility tool for building and releasing Prometheus projects
%prep
%setup -q -T -n %{name}-%{version} -b 0
tar -xzvf %{SOURCE1}
%patch0 -p1
%build
GOFLAGS=-mod=vendor make build
export GOFLAGS="-mod=vendor -buildmode=pie"
make build
%install
install -D -m 755 %{name}-%{version} %{buildroot}%{_bindir}/promu
install -D -m 0755 %{name}-%{version} %{buildroot}%{_bindir}/promu
%files
%defattr(-,root,root,-)
%{_bindir}/promu
%changelog
* Tue Jan 14 2025 jiangxinyu <jiangxinyu@kylinos.cn> - 0.15.0-2
- Type: CVE
- CVE: CVE-2023-39326 CVE-2024-24789 CVE-2024-24791
- SUG: NA
- DESC: Rebuild to fix CVE-2023-39326 CVE-2024-24789 CVE-2024-24791
* Thu Sep 07 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 0.15.0-1
- Update package to version 0.15.0
* Wed Jun 14 2023 EastDong <xudong23@iscas.ac.cn> - 0.7.0-4
- backport to support riscv
* Fri Mar 10 2023 caodongxia <caodongxia@h-partners.com> - 0.7.0-3
- remove linkmode external
* Fri Mar 03 2023 wangjunqi <wangjunqi@kylinos.cn> - 0.7.0-2
- add strip and pie
* Wed Dec 16 2020 yangzhao <yangzhao1@kylinos.cn> - 0.7.0-1
- Init project promu

Binary file not shown.