import mtr-0.92-3.el8

This commit is contained in:
CentOS Sources 2019-11-05 17:01:45 -05:00 committed by Andrew Lukoshko
parent 95e318388f
commit a32347877a
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,28 @@
From 9d2800441a73a1dfb84f1c97a1e2755b9cac163c Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Fri, 26 Jul 2019 01:56:10 +0200
Subject: [PATCH] buildsys: don't set filecaps nor setuid manually and let
rpmbuild handle it
---
Makefile.am | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c0709ca..daebb84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,10 +40,6 @@ $(PATHFILES): Makefile
dist_man_MANS = mtr.8 mtr-packet.8
PATHFILES += man/mtr.8 man/mtr-packet.8
-install-exec-hook:
- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \
- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet
-
mtr_SOURCES = ui/mtr.c ui/mtr.h \
ui/net.c ui/net.h \
ui/cmdpipe.c ui/cmdpipe.h \
--
2.21.0

View File

@ -3,7 +3,7 @@
Summary: Network diagnostic tool combining 'traceroute' and 'ping'
Name: mtr
Version: 0.92
Release: 1%{?dist}
Release: 3%{?dist}
Epoch: 2
Group: Applications/Internet
License: GPLv2
@ -13,6 +13,8 @@ Source1: net-x%{name}.desktop
Source2: mtr-gtk-pkexec-wrapper.sh
Source3: org.fedoraproject.mtr.policy
Patch0001: 0001-buildsys-don-t-set-filecaps-nor-setuid-manually-and-.patch
BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
BuildRequires: autoconf automake libtool git
@ -49,9 +51,10 @@ the link to each machine. While doing this, it prints running statistics
about each machine.
%prep
%setup -q
%autosetup -S git
%build
autoreconf -vfi
export CFLAGS="%{optflags} -fPIE"
export LDFLAGS="-z now -pie"
@ -92,6 +95,12 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%{_datadir}/applications/net-x%{name}.desktop
%changelog
* Mon Jul 29 2019 Michal Sekletar <msekleta@redhat.com> - 2:0.92-3
- fix name of the gating config file (#1681042)
* Fri Jul 26 2019 Michal Sekletar <msekleta@redhat.com> - 2:0.92-2
- don't set setuid and filecaps manually (#1633182)
* Sat Aug 26 2017 Robert Scheck <robert@fedoraproject.org> - 2:0.92-1
- Rebase to 0.92 (#1458265)