Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package prometheus-blackbox_exporter for
openSUSE:Factory checked in at 2021-11-10 21:47:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/prometheus-blackbox_exporter (Old)
and /work/SRC/openSUSE:Factory/.prometheus-blackbox_exporter.new.1890
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prometheus-blackbox_exporter"
Wed Nov 10 21:47:00 2021 rev:3 rq:930666 version:0.19.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/prometheus-blackbox_exporter/prometheus-blackbox_exporter.changes
2021-09-29 20:20:43.623146179 +0200
+++
/work/SRC/openSUSE:Factory/.prometheus-blackbox_exporter.new.1890/prometheus-blackbox_exporter.changes
2021-11-10 21:47:52.043848561 +0100
@@ -1,0 +2,6 @@
+Wed Sep 29 15:58:49 UTC 2021 - Witek Bedyk <[email protected]>
+
+- Use %set_permissions and %verify_permissions for SLE 12
+- Remove %{go_nostrip}
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ prometheus-blackbox_exporter.spec ++++++
--- /var/tmp/diff_new_pack.oTvEBn/_old 2021-11-10 21:47:52.523848770 +0100
+++ /var/tmp/diff_new_pack.oTvEBn/_new 2021-11-10 21:47:52.523848770 +0100
@@ -30,10 +30,10 @@
BuildRequires: golang-packaging
BuildRequires: libcap-progs
BuildRequires: golang(API) >= 1.14
-%{go_nostrip}
%{?systemd_ordering}
Requires(pre): user(prometheus)
Requires(pre): group(prometheus)
+Requires(post): permissions
%description
Prometheus blackbox exporter allows blackbox probing of endpoints over HTTP,
HTTPS, DNS, TCP and ICMP.
@@ -56,9 +56,17 @@
%post
%service_add_post prometheus-blackbox_exporter.service
-if [ -x %{_sbindir}/setcap ]; then
- %{_sbindir}/setcap cap_net_raw=ep %{_bindir}/blackbox_exporter
-fi
+# Because of more relaxed ping_group_range setting in sysctl in SLE/openSUSE 15
+# everyone is allowed to create IPPROTO_ICMP sockets
+# and hence no need to set capability
+%if 0%{?suse_version} == 1315
+ %set_permissions %{_bindir}/blackbox_exporter
+%endif
+
+%verifyscript
+%if 0%{?suse_version} == 1315
+ %verify_permissions -e %{_bindir}/blackbox_exporter
+%endif
%preun
%service_del_preun prometheus-blackbox_exporter.service
@@ -70,7 +78,7 @@
%defattr(-,root,root)
%doc CHANGELOG.md README.md
%license LICENSE
-%{_bindir}/blackbox_exporter
+%verify(not caps) %attr(755,root,root) %{_bindir}/blackbox_exporter
%{_unitdir}/prometheus-blackbox_exporter.service
%dir %{_sysconfdir}/prometheus
%config(noreplace) %{_sysconfdir}/prometheus/blackbox.yml
