|
@@ -1,14 +1,19 @@
|
|
|
|
+%bcond_with systemd
|
|
|
|
+
|
|
Summary: Network monitoring tools including ping.
|
|
Summary: Network monitoring tools including ping.
|
|
Summary(ja): ping 等のネットワークモニタツール集
|
|
Summary(ja): ping 等のネットワークモニタツール集
|
|
Name: iputils
|
|
Name: iputils
|
|
-Version: 20190709
|
|
+Version: 20210202
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
|
+Group: network
|
|
|
|
+Vendor: Project Vine
|
|
|
|
+Distribution: Vine Linux
|
|
|
|
+
|
|
# some parts are under the original BSD (ping.c)
|
|
# some parts are under the original BSD (ping.c)
|
|
# some are under GPLv2+ (tracepath.c)
|
|
# some are under GPLv2+ (tracepath.c)
|
|
License: BSD and GPLv2+
|
|
License: BSD and GPLv2+
|
|
-Group: System Environment/Daemons
|
|
|
|
URL: https://github.com/iputils/iputils
|
|
URL: https://github.com/iputils/iputils
|
|
-Source0: https://github.com/iputils/iputils/archive/s%{version}.tar.gz#/%{name}-s%{version}.tar.gz
|
|
+Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz#/%{name}-s%{version}.tar.gz
|
|
Source1: ifenslave.tar.gz
|
|
Source1: ifenslave.tar.gz
|
|
Source3: rdisc.initd
|
|
Source3: rdisc.initd
|
|
Source5: rdisc.sysconfig
|
|
Source5: rdisc.sysconfig
|
|
@@ -19,11 +24,9 @@ Source10: bsd.txt
|
|
Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
|
Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
|
|
|
|
|
Patch1: iputils-ifenslave.patch
|
|
Patch1: iputils-ifenslave.patch
|
|
-Patch2: iputils-fix-arping.patch
|
|
|
|
|
|
|
|
# Vine Source(s)/Patch(es)
|
|
# Vine Source(s)/Patch(es)
|
|
|
|
|
|
-
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRequires: docbook-utils perl-SGMLSpm
|
|
BuildRequires: docbook-utils perl-SGMLSpm
|
|
BuildRequires: glibc-kernheaders >= 2.4-8.19
|
|
BuildRequires: glibc-kernheaders >= 2.4-8.19
|
|
@@ -33,13 +36,14 @@ BuildRequires: libcap-devel
|
|
BuildRequires: libxslt
|
|
BuildRequires: libxslt
|
|
BuildRequires: docbook5-style-xsl
|
|
BuildRequires: docbook5-style-xsl
|
|
BuildRequires: meson
|
|
BuildRequires: meson
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%{?systemd_requires}
|
|
|
|
+%else
|
|
Requires(post): chkconfig
|
|
Requires(post): chkconfig
|
|
Requires(preun): chkconfig
|
|
Requires(preun): chkconfig
|
|
Requires(preun): initscripts
|
|
Requires(preun): initscripts
|
|
Requires(postun): initscripts
|
|
Requires(postun): initscripts
|
|
-
|
|
+%endif
|
|
-Vendor: Project Vine
|
|
|
|
-Distribution: Vine Linux
|
|
|
|
|
|
|
|
%description
|
|
%description
|
|
The iputils package contains basic utilities for monitoring a network,
|
|
The iputils package contains basic utilities for monitoring a network,
|
|
@@ -47,13 +51,17 @@ including ping. The ping command sends a series of ICMP protocol
|
|
ECHO_REQUEST packets to a specified network host to discover whether
|
|
ECHO_REQUEST packets to a specified network host to discover whether
|
|
the target machine is alive and receiving network traffic.
|
|
the target machine is alive and receiving network traffic.
|
|
|
|
|
|
|
|
+
|
|
|
|
+%debug_package
|
|
|
|
+
|
|
|
|
+
|
|
%prep
|
|
%prep
|
|
-%setup -q -a 1 -n %{name}-s%{version}
|
|
+%setup -q -a 1 -n %{name}-%{version}
|
|
|
|
|
|
cp %{SOURCE10} %{SOURCE11} .
|
|
cp %{SOURCE10} %{SOURCE11} .
|
|
|
|
|
|
%patch1 -p1
|
|
%patch1 -p1
|
|
-%patch2 -p1
|
|
+
|
|
|
|
|
|
%build
|
|
%build
|
|
%ifarch s390 s390x
|
|
%ifarch s390 s390x
|
|
@@ -63,7 +71,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie"
|
|
%endif
|
|
%endif
|
|
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
|
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
|
|
|
|
|
-%meson
|
|
+%meson \
|
|
|
|
+%if %{with systemd}
|
|
|
|
+ -Dsystemdunitdir="%{_unitdir}" \
|
|
|
|
+ -DINSTALL_SYSTEMD_UNITS=true \
|
|
|
|
+%endif
|
|
|
|
+ %{nil}
|
|
%meson_build
|
|
%meson_build
|
|
%ninja_build -C %{_target_platform} iputils-gmo
|
|
%ninja_build -C %{_target_platform} iputils-gmo
|
|
|
|
|
|
@@ -71,76 +84,96 @@ gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
|
|
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
-rm -rf ${RPM_BUILD_ROOT}
|
|
+rm -rf %{buildroot}
|
|
|
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
|
|
+mkdir -p %{buildroot}%{_bindir}
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
|
|
+mkdir -p %{buildroot}%{_sbindir}
|
|
-mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
|
|
+mkdir -p %{buildroot}/{bin,sbin}
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
+mkdir -p $buildroot%{_sysconfdir}/sysconfig
|
|
|
|
|
|
pushd %{_target_platform}
|
|
pushd %{_target_platform}
|
|
-install -c clockdiff ${RPM_BUILD_ROOT}%{_sbindir}/
|
|
+install -c clockdiff %{buildroot}%{_sbindir}/
|
|
-install -cp arping ${RPM_BUILD_ROOT}/sbin/
|
|
+install -cp arping %{buildroot}/sbin/
|
|
-ln -s /sbin/arping ${RPM_BUILD_ROOT}%{_sbindir}/arping
|
|
+ln -s /sbin/arping %{buildroot}%{_sbindir}/arping
|
|
-install -cp ping ${RPM_BUILD_ROOT}/bin/
|
|
+install -cp ping/ping %{buildroot}/bin/
|
|
-install -cp ../ifenslave ${RPM_BUILD_ROOT}/sbin/
|
|
+install -cp ../ifenslave %{buildroot}/sbin/
|
|
-install -cp rdisc ${RPM_BUILD_ROOT}/sbin/
|
|
+install -cp rdisc %{buildroot}/sbin/
|
|
-install -cp tracepath ${RPM_BUILD_ROOT}/bin/
|
|
+install -cp tracepath %{buildroot}/bin/
|
|
-install -cp ninfod/ninfod ${RPM_BUILD_ROOT}/sbin/
|
|
+install -cp ninfod/ninfod %{buildroot}/sbin/
|
|
-
|
|
+
|
|
-ln -sf /bin/ping ${RPM_BUILD_ROOT}%{_sbindir}
|
|
+ln -sf /bin/ping %{buildroot}%{_sbindir}
|
|
-ln -sf /bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping6
|
|
+ln -sf /bin/ping %{buildroot}%{_sbindir}/ping6
|
|
-ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}
|
|
+ln -sf /bin/tracepath %{buildroot}%{_sbindir}
|
|
-ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath6
|
|
+ln -sf /bin/tracepath %{buildroot}%{_sbindir}/tracepath6
|
|
-
|
|
+
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
|
|
+mkdir -p %{buildroot}%{_mandir}/man8
|
|
-install -cp doc/clockdiff.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp doc/clockdiff.8 %{buildroot}%{_mandir}/man8/
|
|
-install -cp doc/arping.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp doc/arping.8 %{buildroot}%{_mandir}/man8/
|
|
-install -cp doc/ping.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp doc/ping.8 %{buildroot}%{_mandir}/man8/
|
|
-install -cp doc/rdisc.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp doc/rdisc.8 %{buildroot}%{_mandir}/man8/
|
|
-install -cp doc/tracepath.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp doc/tracepath.8 %{buildroot}%{_mandir}/man8/
|
|
-install -cp doc/ninfod.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp doc/ninfod.8 %{buildroot}%{_mandir}/man8/
|
|
-install -cp ../ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp ../ifenslave.8 %{buildroot}%{_mandir}/man8/
|
|
-ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
|
|
+ln -s ping.8.gz %{buildroot}%{_mandir}/man8/ping6.8.gz
|
|
-ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
|
|
+ln -s tracepath.8.gz %{buildroot}%{_mandir}/man8/tracepath6.8.gz
|
|
-
|
|
+
|
|
-install -dp ${RPM_BUILD_ROOT}%{_datadir}/locale/ja/LC_MESSAGES
|
|
+install -dp %{buildroot}%{_datadir}/locale/ja/LC_MESSAGES
|
|
-install -m 644 po/ja.gmo $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/iputils.mo
|
|
+install -m 644 po/ja.gmo %{buildroot}%{_datadir}/locale/ja/LC_MESSAGES/iputils.mo
|
|
popd
|
|
popd
|
|
|
|
|
|
-find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
|
|
+find %{buildroot}%{_mandir} -type f | xargs chmod 644
|
|
|
|
|
|
-install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
|
|
+%if %{with systemd}
|
|
-install -m 755 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
|
|
+install -Dpm644 %{_target_platform}/rdisc.service %{buildroot}%{_unitdir}/rdisc.service
|
|
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc
|
|
+install -Dpm644 %{_target_platform}/ninfod/ninfod.service %{buildroot}%{_unitdir}/ninfod.service
|
|
-install -m 755 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/ninfod
|
|
+sed -i -e 's|%{_sbindir}/|/sbin/|' %{buildroot}%{_unitdir}/*
|
|
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
|
|
+%else
|
|
|
|
+install -dp %{buildroot}%{_sysconfdir}/rc.d/init.d
|
|
|
|
+install -m 755 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/rc.d/init.d/rdisc
|
|
|
|
+install -m 755 -p %{SOURCE6} %{buildroot}%{_sysconfdir}/rc.d/init.d/ninfod
|
|
|
|
+%endif
|
|
|
|
+
|
|
|
|
+install -Dpm644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/rdisc
|
|
|
|
+install -Dpm644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/ninfod
|
|
|
|
|
|
%find_lang %{name}
|
|
%find_lang %{name}
|
|
|
|
|
|
|
|
|
|
|
|
+%clean
|
|
|
|
+rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
+
|
|
|
|
+
|
|
%post
|
|
%post
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%systemd_post rdisc.service ninfod.service
|
|
|
|
+%else
|
|
/sbin/chkconfig --add rdisc
|
|
/sbin/chkconfig --add rdisc
|
|
/sbin/chkconfig --add ninfod
|
|
/sbin/chkconfig --add ninfod
|
|
|
|
+%endif
|
|
|
|
|
|
%preun
|
|
%preun
|
|
-if [ $1 = 0 ]; then
|
|
+%if %{with systemd}
|
|
|
|
+%systemd_preun rdisc.service ninfod.service
|
|
|
|
+%else
|
|
|
|
+if [ $1 = 0 -o -x /bin/systemctl ]; then
|
|
service rdisc stop >/dev/null 2>&1
|
|
service rdisc stop >/dev/null 2>&1
|
|
service ninfod stop >/dev/null 2>&1
|
|
service ninfod stop >/dev/null 2>&1
|
|
/sbin/chkconfig --del rdisc
|
|
/sbin/chkconfig --del rdisc
|
|
/sbin/chkconfig --del ninfod
|
|
/sbin/chkconfig --del ninfod
|
|
fi
|
|
fi
|
|
|
|
+%endif
|
|
|
|
|
|
%postun
|
|
%postun
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%systemd_postun_with_restart rdisc.service ninfod.service
|
|
|
|
+%else
|
|
if [ "$1" -ge "1" ]; then
|
|
if [ "$1" -ge "1" ]; then
|
|
service rdisc condrestart >/dev/null 2>&1 || :
|
|
service rdisc condrestart >/dev/null 2>&1 || :
|
|
service ninfod condrestart >/dev/null 2>&1 || :
|
|
service ninfod condrestart >/dev/null 2>&1 || :
|
|
fi
|
|
fi
|
|
|
|
+%endif
|
|
|
|
|
|
|
|
|
|
-%clean
|
|
|
|
-rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
-
|
|
|
|
%files -f %{name}.lang
|
|
%files -f %{name}.lang
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
%license LICENSE*
|
|
%license LICENSE*
|
|
@@ -158,12 +191,21 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
%{_sbindir}/tracepath
|
|
%{_sbindir}/tracepath
|
|
%{_sbindir}/tracepath6
|
|
%{_sbindir}/tracepath6
|
|
%{_mandir}/man8/*
|
|
%{_mandir}/man8/*
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%{_unitdir}/*
|
|
|
|
+%else
|
|
%{_sysconfdir}/rc.d/init.d/rdisc
|
|
%{_sysconfdir}/rc.d/init.d/rdisc
|
|
%{_sysconfdir}/rc.d/init.d/ninfod
|
|
%{_sysconfdir}/rc.d/init.d/ninfod
|
|
|
|
+%endif
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Tue Feb 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20210202-1
|
|
|
|
+- updated to 20210202.
|
|
|
|
+- dropped Patch2: fixed in upstream.
|
|
|
|
+- added systemd support (disabled as default).
|
|
|
|
+
|
|
* Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190709-2
|
|
* Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190709-2
|
|
- imported Patch2 from upstream to fix arping.
|
|
- imported Patch2 from upstream to fix arping.
|
|
|
|
|