diff --git a/.gitignore b/.gitignore index 490495e..0b16e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ /zmap-4.2.0.tar.gz /zmap-4.3.0.tar.gz /zmap-4.3.1.tar.gz -/zmap-4.3.4.tar.gz diff --git a/sources b/sources index 917aac9..00d3408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmap-4.3.4.tar.gz) = 225b79e795b0925f59e727b02455e087dc4a559190f76eaf96155c5f10aba02334de0ba685539b029a684d4f4bb61ce084ba825d766f6b0fa1ced17c773f4df7 +SHA512 (zmap-4.3.1.tar.gz) = 940f15b485df50304eb7eaac582cd2cb60e072eb4b84438cb39cdf54fd7c6e06d224a3831e37b6e77b030e83da3c70b352cdf24e81eeb9a5bfb3beb78760b627 diff --git a/zmap-bin-sbin-merge.patch b/zmap-bin-sbin-merge.patch deleted file mode 100644 index 7b6fdae..0000000 --- a/zmap-bin-sbin-merge.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CMakeLists.txt-orig 2025-05-12 18:12:45.000000000 -0300 -+++ src/CMakeLists.txt 2025-11-09 02:34:07.156908310 -0300 -@@ -274,7 +274,7 @@ - zblocklist - ziterate - ztee -- RUNTIME DESTINATION sbin -+ RUNTIME DESTINATION bin - ) - - # Install Manpages diff --git a/zmap.spec b/zmap.spec index 3283837..1f5118a 100644 --- a/zmap.spec +++ b/zmap.spec @@ -3,14 +3,13 @@ %bcond_without debug Name: zmap -Version: 4.3.4 +Version: 4.3.1 Release: %autorelease Summary: Network scanner for Internet-wide network studies # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 URL: https://zmap.io Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: zmap-bin-sbin-merge.patch BuildRequires: byacc BuildRequires: cmake BuildRequires: flex @@ -41,7 +40,7 @@ respect requests to stop scanning and to exclude these networks from ongoing scanning. %prep -%autosetup -p 0 +%autosetup %build %cmake -DENABLE_DEVELOPMENT=OFF \ @@ -62,10 +61,10 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ %license LICENSE %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/* -%{_bindir}/zmap -%{_bindir}/zblocklist -%{_bindir}/ziterate -%{_bindir}/ztee +%{_sbindir}/zmap +%{_sbindir}/zblocklist +%{_sbindir}/ziterate +%{_sbindir}/ztee %{_mandir}/man1/zmap.1* %{_mandir}/man1/zblocklist.1* %{_mandir}/man1/ziterate.1*