iputils-20161105-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11525 ec354946-7b23-47d6-9f5a-488ba84defc7

i/iputils/iputils-vl.spec

@@ -1,28 +1,38 @@
 Summary: Network monitoring tools including ping.
 Summary(ja): ping 等のネットワークモニタツール集
 Name: iputils
-Version: 20140519
+Version: 20161105
 Release: 1%{?_dist_release}
-License: BSD
+# some parts are under the original BSD (ping.c)
+# some are under GPLv2+ (tracepath.c)
+License: BSD and GPLv2+
 Group: System Environment/Daemons
 URL: https://github.com/iputils/iputils
 Source0: https://github.com/iputils/iputils/archive/s%{version}.tar.gz#/%{name}-s%{version}.tar.gz
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
 Source5: rdisc.sysconfig
+Source6: ninfod.initd
+Source7: ninfod.sysconfig
+
+Source10: bsd.txt
+Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
 Patch0: iputils-rh.patch
 Patch1: iputils-ifenslave.patch
-Patch2: iputils-tracepath-doc.patch
+Patch2: 0001-arping-tracepath-removed-unused-idna-header.patch
+Patch3: 0002-traceroute6-use-getaddrinfo-IDNA-conversion.patch
+Patch4: 0003-ping6-simplified-IDNA-usage.patch
+Patch5: 0004-ping-use-libidn2-instead-of-libidn.patch
 
 # Vine Source(s)/Patch(es)
-Source10: iputils-s20140519-ja.po
-Patch100: iputils-s20140519-gettext.patch
+Source1000: iputils-s20161105-ja.po
+Patch1000: iputils-s20161105-gettext.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-utils perl-SGMLSpm
 BuildRequires: glibc-kernheaders >= 2.4-8.19
-BuildRequires: libidn-devel
+BuildRequires: libidn2-devel
 BuildRequires: openssl-devel
 BuildRequires: libcap-devel
 Requires(post): chkconfig
@@ -30,6 +40,9 @@ Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The iputils package contains basic utilities for monitoring a network,
 including ping. The ping command sends a series of ICMP protocol
@@ -39,15 +52,20 @@ the target machine is alive and receiving network traffic.
 %prep
 %setup -q -a 1 -n %{name}-s%{version}
 
-%patch0 -p1 -b .rh
+cp %{SOURCE10} %{SOURCE11} .
+
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 #
-%patch100 -p1 -b .gettext
+%patch1000 -p1 -b .gettext
 
 # add ja.po
-cp %{SOURCE10} po/ja.po
+cp %{SOURCE1000} po/ja.po
 
 %build
 %ifarch s390 s390x
@@ -55,15 +73,17 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIE"
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
-export LDFLAGS="-pie"
-make %{?_smp_mflags} arping clockdiff ping ping6 rdisc tracepath tracepath6
-gcc -Wall $RPM_OPT_FLAGS ifenslave.c -o ifenslave
+export LDFLAGS="-pie -Wl,-z,relro,-z,now"
+
+make %{?_smp_mflags} arping clockdiff ping rdisc tracepath ninfod
+gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
 make -C doc man
 make -C po
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -74,14 +94,13 @@ ln -s /sbin/arping		${RPM_BUILD_ROOT}%{_sbindir}/arping
 install -cp ping		${RPM_BUILD_ROOT}/bin/
 install -cp ifenslave		${RPM_BUILD_ROOT}/sbin/
 install -cp rdisc		${RPM_BUILD_ROOT}/sbin/
-install -cp ping6		${RPM_BUILD_ROOT}/bin/
 install -cp tracepath		${RPM_BUILD_ROOT}/bin/
-install -cp tracepath6		${RPM_BUILD_ROOT}/bin/
+install -cp ninfod/ninfod	${RPM_BUILD_ROOT}/sbin/
 
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-ln -sf /bin/ping6 ${RPM_BUILD_ROOT}%{_sbindir}
+ln -sf /bin/ping ${RPM_BUILD_ROOT}%{_sbindir}
+ln -sf /bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping6
 ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}
-ln -sf /bin/tracepath6 ${RPM_BUILD_ROOT}%{_sbindir}
+ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath6
 
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 install -cp doc/clockdiff.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
@@ -89,30 +108,43 @@ install -cp doc/arping.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/ping.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/rdisc.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/tracepath.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp doc/ninfod.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp ifenslave.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
+find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
+
 install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 -p %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
+install -m 755 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc
+install -m 755 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/ninfod
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
 
 make -C po install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
+iconv -f ISO88591 -t UTF8 RELNOTES -o RELNOTES.tmp
+touch -r RELNOTES RELNOTES.tmp
+mv -f RELNOTES.tmp RELNOTES
+
 %post
 /sbin/chkconfig --add rdisc
+/sbin/chkconfig --add ninfod
 
 %preun
 if [ $1 = 0 ]; then
    service rdisc stop >/dev/null 2>&1
+   service ninfod stop >/dev/null 2>&1
    /sbin/chkconfig --del rdisc
+   /sbin/chkconfig --del ninfod
 fi 
 
 %postun
 if [ "$1" -ge "1" ]; then
-    service rdisc restart >/dev/null 2>&1 || :
+    service rdisc condrestart >/dev/null 2>&1 || :
+    service ninfod condrestart >/dev/null 2>&1 || :
 fi
 
 
@@ -121,24 +153,31 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc RELNOTES README.bonding
+%doc bsd.txt gpl-2.0.txt RELNOTES README.*
 %{_sbindir}/clockdiff
 /sbin/arping
 %{_sbindir}/arping
 %attr(4755,root,root)	/bin/ping
 /sbin/ifenslave
 /sbin/rdisc
-%attr(4755,root,root) /bin/ping6
 /bin/tracepath
-/bin/tracepath6
+/sbin/ninfod
+%{_sbindir}/ping
 %{_sbindir}/ping6
 %{_sbindir}/tracepath
 %{_sbindir}/tracepath6
-%attr(0644,root,root) %{_mandir}/man8/*
+%{_mandir}/man8/*
 %{_sysconfdir}/rc.d/init.d/rdisc
+%{_sysconfdir}/rc.d/init.d/ninfod
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
 
 %changelog
+* Fri Feb 23 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20161105-1
+- updated to 20161105.
+- updated gettext patch and translation.
+- updated license.
+
 * Sun Jul 13 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 20140519-1
 - update to 20140519
 - update URL to new upstream
@@ -229,7 +268,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Mon Aug 27 2001 Philipp Knirsch <pknirsch@redhat.de> 20001110-6
 - Fixed buffer overflow problem in traceroute6.c (#51135)
 
-* Mon Jul 01 2001 Philipp Knirsch <pknirsch@redhat.de>
+* Sun Jul 01 2001 Philipp Knirsch <pknirsch@redhat.de>
 - Made ping6 and traceroute6 setuid (safe as they drop it VERY early) (#46769)
 
 * Thu Jun 28 2001 Philipp Knirsch <pknirsch@redhat.de>