packages/blackbox_exporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 修复不安全编译问题PIE和strip

Browse Source 
From: @wu-leilei 
Reviewed-by: @wonleing 
Signed-off-by: @wonleing
This commit is contained in:
openeuler-ci-bot 2023-04-10 06:20:25 +00:00 committed by Gitee
commit 837d4afb28
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
add-parameters-to-solve-the-strip.patch Normal file
View File

@ -0,0 +1,20 @@
diff -Nur a/.promu.yml b/.promu.yml
--- a/.promu.yml 2023-03-30 15:38:19.184951580 +0800
+++ b/.promu.yml 2023-03-30 15:41:26.540951580 +0800
@@ -7,11 +7,11 @@
build:
flags: -a -tags netgo
ldflags: |
- -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' -buildmode=pie -X github.com/prometheus/common/version.Version={{.Version}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now' -buildmode=pie -X github.com/prometheus/common/version.Revision={{.Revision}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now' -buildmode=pie -X github.com/prometheus/common/version.Branch={{.Branch}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now' -buildmode=pie -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now' -buildmode=pie -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
tarball:
files:
- blackbox.yml

7
blackbox_exporter.spec
View File

@ -2,13 +2,14 @@
%define debug_package %{nil}
Name: blackbox_exporter
Version: 0.19.0
Release: 2
Release: 3
Summary: Prometheus blackbox prober exporter
License: Apache-2.0
Url: https://github.com/prometheus/blackbox_exporter
Source: https://github.com/prometheus/blackbox_exporter/archive/refs/tags/v%{version}.tar.gz
Source1: %{name}.service
Source2: vendor.tar.gz
Patch0: add-parameters-to-solve-the-strip.patch
BuildRequires: golang promu
Requires(pre): prometheus2
%description
@ -17,6 +18,7 @@ The blackbox exporter allows blackbox probing of endpoints over HTTP, HTTPS, DNS
%prep
%setup -q -n %{name}-%{version}
tar xvf %{SOURCE2} -C .
%patch0 -p1
%build
export GOFLAGS="-mod=vendor"
@ -41,6 +43,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%config(noreplace) %{_sysconfdir}/prometheus/blackbox.yml
%changelog
* Thu Mar 30 2023 wulei <wulei80@h-partners.com> - 0.23.0-3
- Add strip and pie
* Tue Aug 10 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-2
- Fix systemd macro spelling errors.