From a605d9cf5d148936e870ad415447443c18924238bbbbf7585eef9d37d84b1678 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 28 Nov 2017 22:18:35 +0000 Subject: [PATCH 1/2] Accepting request 546244 from home:pluskalm:branches:network:utilities - Reintroduce rarpd as subpackage - Explicitly list content in filelist as we have two subpackages now OBS-URL: https://build.opensuse.org/request/show/546244 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=52 --- iputils.changes | 7 +++++++ iputils.spec | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/iputils.changes b/iputils.changes index 588bcb2..221e59d 100644 --- a/iputils.changes +++ b/iputils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 28 11:31:33 UTC 2017 - mpluskal@suse.com + +- Reintroduce rarpd as subpackage +- Explicitly list content in filelist as we have two subpackages + now + ------------------------------------------------------------------- Mon Nov 13 17:24:40 UTC 2017 - mpluskal@suse.com diff --git a/iputils.spec b/iputils.spec index 83bd41f..e422089 100644 --- a/iputils.spec +++ b/iputils.spec @@ -49,6 +49,15 @@ Provides: /sbin/arping This package contains some small network tools for IPv4 and IPv6 like rdisc, ping, arping and tracepath. +%package -n rarpd +Summary: Reverse Address Resolution Protocol Daemon +Group: Productivity/Networking/System + +%description -n rarpd +Rarpd listens on the Ethernet for broadcast packets asking for reverse +address resolution. These packets are sent by hosts at boot time to find +out their IP addresses. + %prep %setup -q %patch8 -p1 @@ -78,10 +87,11 @@ mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}/%{_bindir} install arping %{buildroot}/%{_sbindir} install clockdiff %{buildroot}/%{_sbindir} -install rdisc %{buildroot}/%{_sbindir}/in.rdisc +install rarpd %{buildroot}/%{_sbindir} +install rdisc %{buildroot}/%{_sbindir}/in.rdisc # boo#795788 install tracepath %{buildroot}/%{_bindir} -install ping %{buildroot}/%{_bindir} +install ping %{buildroot}/%{_bindir} # boo#1017616 ln -sf %{_bindir}/ping %{buildroot}/%{_bindir}/ping6 ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6 @@ -93,6 +103,7 @@ ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6 mkdir -p %{buildroot}/{bin,sbin} ln -sf %{_sbindir}/arping %{buildroot}/sbin ln -sf %{_sbindir}/clockdiff %{buildroot}/sbin +ln -sf %{_sbindir}/rarpd %{buildroot}/sbin ln -sf %{_sbindir}/in.rdisc %{buildroot}/sbin ln -sf %{_bindir}/tracepath %{buildroot}/bin ln -sf %{_bindir}/ping %{buildroot}/bin @@ -102,7 +113,7 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin mkdir -p %{buildroot}/%{_mandir}/man8 # Remove conflicting manpages -rm doc/tftpd* doc/traceroute* doc/rarpd* +rm doc/tftpd* doc/traceroute* # Install the rest install -m 644 doc/*.8 %{buildroot}%{_mandir}/man8/ @@ -121,10 +132,29 @@ install -m 644 doc/*.8 %{buildroot}%{_mandir}/man8/ %{_bindir}/tracepath %{_bindir}/tracepath6 %{_sbindir}/in.rdisc -%{_mandir}/man8/* #UsrMerge -/bin/* -/sbin/* +/bin/ping +/bin/ping6 +/bin/tracepath +/bin/tracepath6 +/sbin/arping +/sbin/clockdiff +/sbin/in.rdisc +#EndUsrMerge +%{_mandir}/man8/arping.8%{ext_man} +%{_mandir}/man8/clockdiff.8%{ext_man} +%{_mandir}/man8/ninfod.8%{ext_man} +%{_mandir}/man8/pg3.8%{ext_man} +%{_mandir}/man8/ping.8%{ext_man} +%{_mandir}/man8/rdisc.8%{ext_man} +%{_mandir}/man8/tracepath.8%{ext_man} #EndUsrMerge +%files -n rarpd +%{_sbindir}/rarpd +#UsrMerge +/sbin/rarpd +#EndUsrMerge +%{_mandir}/man8/rarpd.8%{ext_man} + %changelog From f4d6aa4db5c96a79e28c758b8975b8f6ace8bee8e569290db9ec2691ad7fa1a9 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 30 Nov 2017 08:53:47 +0000 Subject: [PATCH 2/2] Accepting request 546607 from home:msmeissn:branches:network:utilities - mark ping also verify not caps, as these are changed by the permissions package. (bsc#1065835) OBS-URL: https://build.opensuse.org/request/show/546607 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=53 --- iputils.changes | 6 ++++++ iputils.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/iputils.changes b/iputils.changes index 221e59d..d96520c 100644 --- a/iputils.changes +++ b/iputils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 30 08:30:22 UTC 2017 - meissner@suse.com + +- mark ping also verify not caps, as these are changed by the + permissions package. (bsc#1065835) + ------------------------------------------------------------------- Tue Nov 28 11:31:33 UTC 2017 - mpluskal@suse.com diff --git a/iputils.spec b/iputils.spec index e422089..9749757 100644 --- a/iputils.spec +++ b/iputils.spec @@ -125,7 +125,7 @@ install -m 644 doc/*.8 %{buildroot}%{_mandir}/man8/ %files %doc RELNOTES -%verify(not mode) %attr(0755,root,root) %{_bindir}/ping +%verify(not mode caps) %attr(0755,root,root) %{_bindir}/ping %{_bindir}/ping6 %{_sbindir}/arping %{_sbindir}/clockdiff