diff --git a/2ping-1397618874.f2c20471488c.tar.xz b/2ping-1397618874.f2c20471488c.tar.xz deleted file mode 100644 index b690128..0000000 --- a/2ping-1397618874.f2c20471488c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29ee8755bf7ee08e72376e896fb3a0e824ae3fa0f06ad921f8d3db74686ca018 -size 23836 diff --git a/2ping-3.2.1.tar.gz b/2ping-3.2.1.tar.gz new file mode 100644 index 0000000..b311cfe --- /dev/null +++ b/2ping-3.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e53efd33d0f8b98fcc9c5ece26e87119a6bbbc7c4820a9563610143d46712a6 +size 49000 diff --git a/2ping-fix-use-of-uninitialized-warning.patch b/2ping-fix-use-of-uninitialized-warning.patch deleted file mode 100644 index db2c85e..0000000 --- a/2ping-fix-use-of-uninitialized-warning.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c6753e03927cc5f065e3da6a6f735a1691146dd8 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Sat, 4 Apr 2015 12:54:27 +0200 -Subject: [PATCH] 2ping: fix 'use of uninitialized' warning - -With 2ping --listen -6, I see -Use of uninitialized value $opt_intaddr in pattern match (m//) at /usr/bin/2ping line 356. -Check for undef, as there might be one pushed to the array. - -Signed-off-by: Jiri Slaby ---- - script/2ping.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/script/2ping.in b/script/2ping.in -index 24c00b95ec2f..ff117f9b0fd4 100755 ---- a/script/2ping.in -+++ b/script/2ping.in -@@ -350,7 +350,8 @@ if($opt_listen) { - foreach my $opt_intaddr (@working_opt_intaddrs) { - my($sock); - my($is_ipv6) = $opt_ipv6; -- if($opt_ipv6 && $opt_intaddr =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { -+ if($opt_ipv6 && defined $opt_intaddr && -+ $opt_intaddr =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { - $is_ipv6 = 0; - } - my $sockerr = ''; --- -2.3.4 - diff --git a/2ping.changes b/2ping.changes index 824bd3a..1f99d78 100644 --- a/2ping.changes +++ b/2ping.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Jul 24 12:53:10 UTC 2016 - p.drouand@gmail.com + +- Update to version 3.2.1 + * Please read the ChangeLog; not able to track all changes since + previous version +- Upstream moved to python + * Remove %{perl_requires} dependency + * Remove perl recommendations; perl(Digest::CRC), perl(Digest::MD5), + perl(Digest::SHA) and perl(IO::Socket::INET6) + * Add python-devel and python-setuptools requirements +- Use official tarball and download Url +- Remove obsolete 2ping-fix-use-of-uninitialized-warning.patch + ------------------------------------------------------------------- Fri Apr 3 15:29:33 UTC 2015 - jslaby@suse.com diff --git a/2ping.spec b/2ping.spec index 1b39b7e..98ceb02 100644 --- a/2ping.spec +++ b/2ping.spec @@ -1,7 +1,7 @@ # # spec file for package 2ping # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,16 @@ Name: 2ping Summary: Bi-directional ping utility License: GPL-2.0+ Group: Productivity/Networking/Diagnostic -Version: 1397618874.f2c20471488c +Version: 3.2.1 Release: 0 Url: http://www.finnie.org/software/2ping/ -Source0: %{name}-%{version}.tar.xz -Patch0: 2ping-fix-use-of-uninitialized-warning.patch +Source0: http://www.finnie.org/software/2ping/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} -Recommends: perl(Digest::CRC) -Recommends: perl(Digest::MD5) -Recommends: perl(Digest::SHA) -Recommends: perl(IO::Socket::INET6) +BuildRequires: python-devel +BuildRequires: python-setuptools +# A bit tricky but should do it +Provides: %{name} = 1397618874.f2c20471488c +Obsoletes: %{name} = 1397618874.f2c20471488c BuildArch: noarch %description @@ -40,23 +39,26 @@ a 2ping client to determine which direction packet loss occurs. %prep %setup -q -%patch0 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +python setup.py build +install -d -m 0755 %{buildroot}%{_mandir}/man1 +install -m 0644 doc/2ping.1 %{buildroot}%{_mandir}/man1/2ping.1 +install -m 0644 doc/2ping.1 %{buildroot}%{_mandir}/man1/2ping6.1 %install -%perl_make_install -%perl_process_packlist -%perl_gen_filelist -%{_fixperms} $RPM_BUILD_ROOT/* +python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check -make test +python setup.py test -%files -f %{name}.files +%files %defattr(-,root,root) -%doc ChangeLog COPYING README +%doc ChangeLog COPYING README doc/2ping-protocol-examples.py doc/2ping.md doc/2ping-protocol.md +%{_bindir}/2ping +%{_bindir}/2ping6 +%{_mandir}/man1/2ping.1.* +%{_mandir}/man1/2ping6.1.* +%{python_sitelib}/* %changelog diff --git a/_service b/_service deleted file mode 100644 index 29fbd18..0000000 --- a/_service +++ /dev/null @@ -1,11 +0,0 @@ - - - git://github.com/rfinnie/2ping.git - git - - - 2ping-*.tar - xz - - -