Compare commits

..

No commits in common. "3dcabba4f63587fc07ff8365717d90444cc78536" and "1a09aa9ac1b04ee76082745da409b74c5231c1ad" have entirely different histories.

6 changed files with 11 additions and 47 deletions

View File

@ -1,20 +0,0 @@
diff -Nur a/.promu.yml b/.promu.yml
--- a/.promu.yml 2023-02-09 14:54:47.876832158 +0800
+++ b/.promu.yml 2023-02-09 14:56:28.322288215 +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 -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:
- blackbox.yml

Binary file not shown.

Binary file not shown.

View File

@ -1,18 +1,14 @@
%define __debug_install_post %{_rpmconfigdir}/find-debuginfo.sh %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" %{nil}
%define debug_package %{nil}
Name: blackbox_exporter
Version: 0.24.0
Release: 1
Version: 0.19.0
Release: 2
Summary: Prometheus blackbox prober exporter
License: Apache-2.0
URL: https://github.com/prometheus/blackbox_exporter
Source0: https://github.com/prometheus/blackbox_exporter/archive/v%{version}/%{name}-%{version}.tar.gz
Url: https://github.com/prometheus/blackbox_exporter
Source: https://github.com/prometheus/blackbox_exporter/archive/refs/tags/v%{version}.tar.gz
Source1: %{name}.service
# tar -xvf Source0
# run 'go mod vendor' in it
# tar -czvf blackbox_exporter-vendor.tar.gz vendor
Source2: blackbox_exporter-vendor.tar.gz
Patch0: add-parameters-to-solve-the-strip.patch
Source2: vendor.tar.gz
BuildRequires: golang promu
Requires(pre): prometheus2
%description
@ -21,16 +17,16 @@ 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"
promu build
%install
install -D -m 0755 %{name}-%{version} %{buildroot}%{_bindir}/%{name}
install -D -m 0644 blackbox.yml %{buildroot}%{_sysconfdir}/prometheus/blackbox.yml
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
mkdir -p %{buildroot}{%{_bindir},%{_unitdir},%{_sysconfdir}/prometheus}
install -m0755 %{name}-%{version} %{buildroot}%{_bindir}/%{name}
install -m0644 blackbox.yml %{buildroot}%{_sysconfdir}/prometheus/blackbox.yml
install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%post
%systemd_post %{name}.service
@ -45,19 +41,7 @@ install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%config(noreplace) %{_sysconfdir}/prometheus/blackbox.yml
%changelog
* Tue Jan 02 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 0.24.0-1
- Update package to version 0.24.0
* Fri Mar 10 2023 wulei <wulei80@h-partners.com> - 0.23.0-3
- Delete linkmode
* Thu Mar 02 2023 wulei <wulei80@h-partners.com> - 0.23.0-2
- Add strip and pie
* Tue Jan 31 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 0.23.0-1
- Update package to version 0.23.0
* Tue Aug 10 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-2
* Thu Aug 10 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-2
- Fix systemd macro spelling errors.
* Thu Aug 5 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-1

BIN
v0.19.0.tar.gz Normal file

Binary file not shown.

BIN
vendor.tar.gz Normal file

Binary file not shown.