diff --git a/.gitignore b/.gitignore index d093722..490495e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ /zmap-2.1.1.tar.gz /zmap-3.0.0.tar.gz /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 01a4317..917aac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmap-4.2.0.tar.gz) = 97995626a0c7b0f0138095fea0f4d484d361a40db1e71bfa853062d4320bc83049d4fb30f87e648de2dfcc6c6ac6e0da28214507718584c25f1a6063715aa23c +SHA512 (zmap-4.3.4.tar.gz) = 225b79e795b0925f59e727b02455e087dc4a559190f76eaf96155c5f10aba02334de0ba685539b029a684d4f4bb61ce084ba825d766f6b0fa1ced17c773f4df7 diff --git a/zmap-bin-sbin-merge.patch b/zmap-bin-sbin-merge.patch new file mode 100644 index 0000000..7b6fdae --- /dev/null +++ b/zmap-bin-sbin-merge.patch @@ -0,0 +1,11 @@ +--- 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 e61781e..3283837 100644 --- a/zmap.spec +++ b/zmap.spec @@ -3,12 +3,14 @@ %bcond_without debug Name: zmap -Version: 4.2.0 +Version: 4.3.4 Release: %autorelease Summary: Network scanner for Internet-wide network studies -License: ASL 2.0 +# 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 @@ -39,7 +41,7 @@ respect requests to stop scanning and to exclude these networks from ongoing scanning. %prep -%autosetup +%autosetup -p 0 %build %cmake -DENABLE_DEVELOPMENT=OFF \ @@ -60,10 +62,10 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ %license LICENSE %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/* -%{_sbindir}/zmap -%{_sbindir}/zblocklist -%{_sbindir}/ziterate -%{_sbindir}/ztee +%{_bindir}/zmap +%{_bindir}/zblocklist +%{_bindir}/ziterate +%{_bindir}/ztee %{_mandir}/man1/zmap.1* %{_mandir}/man1/zblocklist.1* %{_mandir}/man1/ziterate.1*