From dad1ef52fd4731c50afeaf8afe130e995bb82a9f666739cf026e88f26ebfdf1a Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 15 Dec 2021 14:22:56 +0000 Subject: [PATCH] Accepting request 940741 from home:pevik:branches:network:utilities - Update to version 20211215 https://github.com/iputils/iputils/releases/tag/20211215 - rarpd and rdisc are going to be removed in next release (https://github.com/iputils/iputils/issues/363) therefore don't pack it since this release - Drop harden_rdisc.service.patch, which was 1) merged upstream 4bb0ace ("systemd: Add ProtectHostname, ProtectKernelLogs") for all services 2) we don't build rdisc since this release OBS-URL: https://build.opensuse.org/request/show/940741 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=99 --- 20210722.tar.gz | 3 -- 20211215.tar.gz | 3 ++ harden_rdisc.service.patch | 16 ---------- iputils.changes | 13 ++++++++ iputils.spec | 61 ++------------------------------------ 5 files changed, 19 insertions(+), 77 deletions(-) delete mode 100644 20210722.tar.gz create mode 100644 20211215.tar.gz delete mode 100644 harden_rdisc.service.patch diff --git a/20210722.tar.gz b/20210722.tar.gz deleted file mode 100644 index 49fd10e..0000000 --- a/20210722.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323 -size 530745 diff --git a/20211215.tar.gz b/20211215.tar.gz new file mode 100644 index 0000000..26f6fe4 --- /dev/null +++ b/20211215.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf +size 524567 diff --git a/harden_rdisc.service.patch b/harden_rdisc.service.patch deleted file mode 100644 index 910ded1..0000000 --- a/harden_rdisc.service.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: iputils-20210722/systemd/rdisc.service.in -=================================================================== ---- iputils-20210722.orig/systemd/rdisc.service.in -+++ iputils-20210722/systemd/rdisc.service.in -@@ -20,6 +20,11 @@ ProtectKernelModules=yes - MemoryDenyWriteExecute=yes - RestrictRealtime=yes - RestrictNamespaces=yes -+# added automatically, for details please see -+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort -+ProtectHostname=true -+ProtectKernelLogs=true -+# end of automatic additions - SystemCallArchitectures=native - LockPersonality=yes - NoNewPrivileges=yes diff --git a/iputils.changes b/iputils.changes index a58d3e0..35b108e 100644 --- a/iputils.changes +++ b/iputils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 15 13:32:02 UTC 2021 - Petr Vorel + +- Update to version 20211215 + https://github.com/iputils/iputils/releases/tag/20211215 +- rarpd and rdisc are going to be removed in next release + (https://github.com/iputils/iputils/issues/363) + therefore don't pack it since this release +- Drop harden_rdisc.service.patch, which was 1) merged upstream + 4bb0ace ("systemd: Add ProtectHostname, ProtectKernelLogs") + for all services + 2) we don't build rdisc since this release + ------------------------------------------------------------------- Fri Oct 15 12:12:11 UTC 2021 - Johannes Segitz diff --git a/iputils.spec b/iputils.spec index fa63e29..cd08f0a 100644 --- a/iputils.spec +++ b/iputils.spec @@ -17,14 +17,13 @@ Name: iputils -Version: 20210722 +Version: 20211215 Release: 0 Summary: IPv4 and IPv6 Networking Utilities License: BSD-3-Clause AND GPL-2.0-or-later Group: Productivity/Networking/Other URL: https://github.com/iputils/iputils Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz -Patch0: harden_rdisc.service.patch BuildRequires: docbook5-xsl-stylesheets BuildRequires: docbook_5 BuildRequires: iproute2 @@ -47,17 +46,7 @@ Provides: /sbin/arping %description 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 -%systemd_requires - -%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. +ping, arping and tracepath. %prep %autosetup -p1 @@ -66,7 +55,7 @@ out their IP addresses. # Pulled-in by the LINK.o variable. export LDFLAGS="-Wl,-z,relro,-z,now" -%meson -DBUILD_NINFOD=false -DBUILD_TFTPD=false -DBUILD_RARPD=true -DNO_SETCAP_OR_SUID=true -Db_pie=true -Dc_std=none +%meson -DBUILD_NINFOD=false -DBUILD_RARPD=false -DBUILD_RDISC=false -DNO_SETCAP_OR_SUID=true -Db_pie=true -Dc_std=none %meson_build %install @@ -79,12 +68,6 @@ ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6 # symlink to man tracepath6(8) ln -sf %{_mandir}/man8/tracepath.8%{ext_man} %{buildroot}%{_mandir}/man8/tracepath6.8%{ext_man} -# Install service files and create rc compat symling -install -Dpm 0644 %_vpath_builddir/rdisc.service %{buildroot}/%{_unitdir} -install -Dpm 0644 %_vpath_builddir/rarpd@.service %{buildroot}/%{_unitdir} -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrarpd -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrdisc - %if !0%{?usrmerged} # We still have reverse dependencies using /sbin/* or /bin/* # so keep these symlinks for now. They are slowly being fixed @@ -92,8 +75,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrdisc mkdir -p %{buildroot}/{bin,sbin} ln -sf %{_bindir}/arping %{buildroot}/bin ln -sf %{_bindir}/clockdiff %{buildroot}/bin -ln -sf %{_sbindir}/rarpd %{buildroot}/sbin -ln -sf %{_sbindir}/rdisc %{buildroot}/sbin ln -sf %{_bindir}/ping %{buildroot}/bin ln -sf %{_bindir}/ping6 %{buildroot}/bin ln -sf %{_bindir}/tracepath %{buildroot}/bin @@ -102,69 +83,33 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin %find_lang %{name} -%pre -%service_add_pre rdisc.service - %post -%service_add_post rdisc.service %set_permissions %{_bindir}/clockdiff %verifyscript %verify_permissions -e %{_bindir}/clockdiff -%preun -%service_del_preun rdisc.service - -%postun -%service_del_postun rdisc.service - -%pre -n rarpd -%service_add_pre rarpd@.service - -%post -n rarpd -%service_add_post rarpd@.service - -%preun -n rarpd -%service_del_preun rarpd@.service - -%postun -n rarpd -%service_del_postun rarpd@.service - %files -f %{name}.lang %license LICENSE %{_bindir}/arping %verify(not mode caps) %attr(0755,root,root) %{_bindir}/clockdiff %verify(not mode caps) %attr(0755,root,root) %{_bindir}/ping %{_bindir}/ping6 -%{_sbindir}/rcrdisc -%{_sbindir}/rdisc %{_bindir}/tracepath %{_bindir}/tracepath6 -%{_unitdir}/rdisc.service %if !0%{?usrmerged} /bin/arping /bin/clockdiff /bin/ping /bin/ping6 -/sbin/rdisc /bin/tracepath /bin/tracepath6 %endif %{_mandir}/man8/arping.8%{?ext_man} %{_mandir}/man8/clockdiff.8%{?ext_man} %{_mandir}/man8/ping.8%{?ext_man} -%{_mandir}/man8/rdisc.8%{?ext_man} %{_mandir}/man8/tracepath.8%{?ext_man} %{_mandir}/man8/tracepath6.8%{?ext_man} -%files -n rarpd -%{_sbindir}/rarpd -%{_unitdir}/rarpd@.service -%{_sbindir}/rcrarpd -%if !0%{?usrmerged} -/sbin/rarpd -%endif -%{_mandir}/man8/rarpd.8%{?ext_man} - %changelog