From ebf3d4c35949e504af7b7218a227ccc47d1a7f07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:45:25 +0000 Subject: [PATCH 01/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zmap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zmap.spec b/zmap.spec index 0f68b5b..34b0e5d 100644 --- a/zmap.spec +++ b/zmap.spec @@ -6,7 +6,7 @@ Name: zmap Version: 2.1.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Network scanner for Internet-wide network studies License: ASL 2.0 URL: https://zmap.io @@ -81,6 +81,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ %{_mandir}/man1/ztee.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.1.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5901c797b3a75e6552a92590201c2d0203595785 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 9 Aug 2023 23:26:10 -0300 Subject: [PATCH 02/15] opt-in to autochangelog --- changelog | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ zmap.spec | 110 +------------------------------ 2 files changed, 192 insertions(+), 108 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..34b0e5d --- /dev/null +++ b/changelog @@ -0,0 +1,190 @@ +%global __cmake_in_source_build 1 +%bcond_with pfring +%bcond_without hiredis +%bcond_with mongodb +%bcond_without debug + +Name: zmap +Version: 2.1.1 +Release: 22%{?dist} +Summary: Network scanner for Internet-wide network studies +License: ASL 2.0 +URL: https://zmap.io +Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: gcc +BuildRequires: byacc +BuildRequires: cmake +BuildRequires: flex +BuildRequires: gengetopt +BuildRequires: gmp-devel +%if %{with hiredis} +BuildRequires: hiredis-devel +%endif +BuildRequires: json-c-devel +BuildRequires: libpcap-devel +%if %{with mongodb} +BuildRequires: pkgconfig(libmongoc-1.0) +%endif + +%description +ZMap is an open-source network scanner that enables researchers to easily +perform Internet-wide network studies. With a single machine and a well +provisioned network uplink, ZMap is capable of performing a complete scan of +the IPv4 address space in under 45 minutes, approaching the theoretical limit +of gigabit Ethernet. + +ZMap can be used to study protocol adoption over time, monitor service +availability, and help us better understand large systems distributed across +the Internet. + +========== WARNING ========== +While ZMap is a powerful tool for researchers, please keep in mind that by +running ZMap, you are potentially scanning the ENTIRE IPv4 address space and +some users may not appreciate your scanning. We encourage ZMap users to +respect requests to stop scanning and to exclude these networks from ongoing +scanning. + +%prep +%setup -q + +# https://github.com/zmap/zmap/pull/332 +sed -i 's|${CMAKE_C_FLAGS} ${GCCWARNINGS}|${GCCWARNINGS} ${CMAKE_C_FLAGS}|g;s|${CMAKE_EXE_LINKER_FLAGS} ${LDHARDENING}|${LDHARDENING} ${CMAKE_EXE_LINKER_FLAGS}|g' CMakeLists.txt + +%build +%cmake -DWITH_JSON=ON \ +%if %{with mongodb} + -DWITH_MONGO=ON \ +%endif +%if %{with hiredis} + -DWITH_REDIS=ON \ +%endif + -DWITH_PFRING=OFF + +%cmake_build + +chmod 644 -v examples/udp-probes/* +find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ + +%install +%cmake_install + +%files +%doc AUTHORS CHANGELOG.md README.md examples/ +%license LICENSE +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/* +%{_sbindir}/zmap +%{_sbindir}/zblacklist +%{_sbindir}/ztee +%{_mandir}/man1/zmap.1* +%{_mandir}/man1/zblacklist.1* +%{_mandir}/man1/ztee.1* + +%changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 2.1.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.1.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 18 2022 Kevin Fenzi - 2.1.1-18 +- Rebuild for hiredis 1.0.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 2.1.1-16 +- Rebuild for versioned symbols in json-c + +* Thu Jan 28 2021 Fedora Release Engineering - 2.1.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.1.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Apr 21 2020 Björn Esser - 2.1.1-13 +- Rebuild (json-c) + +* Fri Jan 31 2020 Fedora Release Engineering - 2.1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Björn Esser - 2.1.1-9 +- Append curdir to CMake invokation. (#1668512) + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Mar 06 2018 Björn Esser - 2.1.1-7 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + +* Fri Feb 09 2018 Fedora Release Engineering - 2.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 10 2017 Björn Esser - 2.1.1-5 +- Rebuilt for libjson-c.so.3 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Mar 02 2016 Fabio Alessandro Locati - 2.1.1-1 +- Update to 2.1.1 +- Clean the spec a little bit + +* Fri Feb 05 2016 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 29 2015 Peter Robinson 2.1.0-2 +- rebuild (hiredis) + +* Thu Sep 03 2015 Christopher Meng - 2.1.0-1 +- Update to 2.1.0 + +* Sun Feb 22 2015 Christopher Meng - 1.2.1-3 +- Rebuilt for hiredis 0.12.1 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jul 20 2014 Christopher Meng - 1.2.1-1 +- Update to 1.2.1 + +* Wed Mar 12 2014 Christopher Meng - 1.2.0-1 +- Update to 1.2.0 + +* Mon Jan 27 2014 Christopher Meng - 1.1.2-1 +- Update to 1.1.2 + +* Thu Dec 19 2013 Christopher Meng - 1.1.1-1 +- Update to 1.1.1 + +* Fri Nov 22 2013 Christopher Meng - 1.1.0-2 +- Set 644 to examples. +- Fix wrong line endings. + +* Tue Nov 19 2013 Christopher Meng - 1.1.0-1 +- Update to 1.1.0 +- Enable harden building. + +* Mon Aug 26 2013 Christopher Meng - 1.0.3-2 +- Correct the license and summary. + +* Mon Aug 19 2013 Christopher Meng - 1.0.3-1 +- Initial Package. diff --git a/zmap.spec b/zmap.spec index 34b0e5d..ab38112 100644 --- a/zmap.spec +++ b/zmap.spec @@ -6,7 +6,7 @@ Name: zmap Version: 2.1.1 -Release: 22%{?dist} +Release: %autorelease Summary: Network scanner for Internet-wide network studies License: ASL 2.0 URL: https://zmap.io @@ -81,110 +81,4 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ %{_mandir}/man1/ztee.1* %changelog -* Sat Jul 22 2023 Fedora Release Engineering - 2.1.1-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.1.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.1.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.1.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 18 2022 Kevin Fenzi - 2.1.1-18 -- Rebuild for hiredis 1.0.2 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.1.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 2.1.1-16 -- Rebuild for versioned symbols in json-c - -* Thu Jan 28 2021 Fedora Release Engineering - 2.1.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.1.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Apr 21 2020 Björn Esser - 2.1.1-13 -- Rebuild (json-c) - -* Fri Jan 31 2020 Fedora Release Engineering - 2.1.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 23 2019 Björn Esser - 2.1.1-9 -- Append curdir to CMake invokation. (#1668512) - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 06 2018 Björn Esser - 2.1.1-7 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Dec 10 2017 Björn Esser - 2.1.1-5 -- Rebuilt for libjson-c.so.3 - -* Thu Aug 03 2017 Fedora Release Engineering - 2.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Mar 02 2016 Fabio Alessandro Locati - 2.1.1-1 -- Update to 2.1.1 -- Clean the spec a little bit - -* Fri Feb 05 2016 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Sep 29 2015 Peter Robinson 2.1.0-2 -- rebuild (hiredis) - -* Thu Sep 03 2015 Christopher Meng - 2.1.0-1 -- Update to 2.1.0 - -* Sun Feb 22 2015 Christopher Meng - 1.2.1-3 -- Rebuilt for hiredis 0.12.1 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jul 20 2014 Christopher Meng - 1.2.1-1 -- Update to 1.2.1 - -* Wed Mar 12 2014 Christopher Meng - 1.2.0-1 -- Update to 1.2.0 - -* Mon Jan 27 2014 Christopher Meng - 1.1.2-1 -- Update to 1.1.2 - -* Thu Dec 19 2013 Christopher Meng - 1.1.1-1 -- Update to 1.1.1 - -* Fri Nov 22 2013 Christopher Meng - 1.1.0-2 -- Set 644 to examples. -- Fix wrong line endings. - -* Tue Nov 19 2013 Christopher Meng - 1.1.0-1 -- Update to 1.1.0 -- Enable harden building. - -* Mon Aug 26 2013 Christopher Meng - 1.0.3-2 -- Correct the license and summary. - -* Mon Aug 19 2013 Christopher Meng - 1.0.3-1 -- Initial Package. +%autochangelog From 944ac912e49ecb5eb1224a30e599685b7877af73 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 9 Aug 2023 23:28:41 -0300 Subject: [PATCH 03/15] fix old changelogs --- changelog | 83 ------------------------------------------------------- 1 file changed, 83 deletions(-) diff --git a/changelog b/changelog index 34b0e5d..c14f7a5 100644 --- a/changelog +++ b/changelog @@ -1,86 +1,3 @@ -%global __cmake_in_source_build 1 -%bcond_with pfring -%bcond_without hiredis -%bcond_with mongodb -%bcond_without debug - -Name: zmap -Version: 2.1.1 -Release: 22%{?dist} -Summary: Network scanner for Internet-wide network studies -License: ASL 2.0 -URL: https://zmap.io -Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: gcc -BuildRequires: byacc -BuildRequires: cmake -BuildRequires: flex -BuildRequires: gengetopt -BuildRequires: gmp-devel -%if %{with hiredis} -BuildRequires: hiredis-devel -%endif -BuildRequires: json-c-devel -BuildRequires: libpcap-devel -%if %{with mongodb} -BuildRequires: pkgconfig(libmongoc-1.0) -%endif - -%description -ZMap is an open-source network scanner that enables researchers to easily -perform Internet-wide network studies. With a single machine and a well -provisioned network uplink, ZMap is capable of performing a complete scan of -the IPv4 address space in under 45 minutes, approaching the theoretical limit -of gigabit Ethernet. - -ZMap can be used to study protocol adoption over time, monitor service -availability, and help us better understand large systems distributed across -the Internet. - -========== WARNING ========== -While ZMap is a powerful tool for researchers, please keep in mind that by -running ZMap, you are potentially scanning the ENTIRE IPv4 address space and -some users may not appreciate your scanning. We encourage ZMap users to -respect requests to stop scanning and to exclude these networks from ongoing -scanning. - -%prep -%setup -q - -# https://github.com/zmap/zmap/pull/332 -sed -i 's|${CMAKE_C_FLAGS} ${GCCWARNINGS}|${GCCWARNINGS} ${CMAKE_C_FLAGS}|g;s|${CMAKE_EXE_LINKER_FLAGS} ${LDHARDENING}|${LDHARDENING} ${CMAKE_EXE_LINKER_FLAGS}|g' CMakeLists.txt - -%build -%cmake -DWITH_JSON=ON \ -%if %{with mongodb} - -DWITH_MONGO=ON \ -%endif -%if %{with hiredis} - -DWITH_REDIS=ON \ -%endif - -DWITH_PFRING=OFF - -%cmake_build - -chmod 644 -v examples/udp-probes/* -find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ - -%install -%cmake_install - -%files -%doc AUTHORS CHANGELOG.md README.md examples/ -%license LICENSE -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/* -%{_sbindir}/zmap -%{_sbindir}/zblacklist -%{_sbindir}/ztee -%{_mandir}/man1/zmap.1* -%{_mandir}/man1/zblacklist.1* -%{_mandir}/man1/ztee.1* - -%changelog * Sat Jul 22 2023 Fedora Release Engineering - 2.1.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9011388c0601d75e6b3795ba20c80e40344933b5 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 9 Aug 2023 23:48:10 -0300 Subject: [PATCH 04/15] update zmap to 3.0.0 fixes rhbz#1989719 --- .gitignore | 1 + sources | 2 +- zmap.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c66d056..f144235 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zmap-1.2.1.tar.gz /zmap-2.1.0.tar.gz /zmap-2.1.1.tar.gz +/zmap-3.0.0.tar.gz diff --git a/sources b/sources index 8c0391f..c6f2a96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a37555ac2beda1dc6f3754b411be545e zmap-2.1.1.tar.gz +SHA512 (zmap-3.0.0.tar.gz) = 3ea4d0e4052c2e4ab303f1ac8c35339bd3e282993b7bbd6b75d2a039df934e57f4d93883b5034c5d25e3f8b2e81f3a036cf1bf1fb2ad6620afa6f7fd3366b0f1 diff --git a/zmap.spec b/zmap.spec index ab38112..613ad8b 100644 --- a/zmap.spec +++ b/zmap.spec @@ -5,7 +5,7 @@ %bcond_without debug Name: zmap -Version: 2.1.1 +Version: 3.0.0 Release: %autorelease Summary: Network scanner for Internet-wide network studies License: ASL 2.0 @@ -17,6 +17,7 @@ BuildRequires: cmake BuildRequires: flex BuildRequires: gengetopt BuildRequires: gmp-devel +BuildRequires: libunistring-devel %if %{with hiredis} BuildRequires: hiredis-devel %endif @@ -45,10 +46,7 @@ respect requests to stop scanning and to exclude these networks from ongoing scanning. %prep -%setup -q - -# https://github.com/zmap/zmap/pull/332 -sed -i 's|${CMAKE_C_FLAGS} ${GCCWARNINGS}|${GCCWARNINGS} ${CMAKE_C_FLAGS}|g;s|${CMAKE_EXE_LINKER_FLAGS} ${LDHARDENING}|${LDHARDENING} ${CMAKE_EXE_LINKER_FLAGS}|g' CMakeLists.txt +%autosetup %build %cmake -DWITH_JSON=ON \ @@ -74,10 +72,12 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/* %{_sbindir}/zmap -%{_sbindir}/zblacklist +%{_sbindir}/zblocklist +%{_sbindir}/ziterate %{_sbindir}/ztee %{_mandir}/man1/zmap.1* -%{_mandir}/man1/zblacklist.1* +%{_mandir}/man1/zblocklist.1* +%{_mandir}/man1/ziterate.1* %{_mandir}/man1/ztee.1* %changelog From 2eb9828f94d5591c7631ba3eee68ad7a33897648 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 9 Aug 2023 23:56:09 -0300 Subject: [PATCH 05/15] upstream removed redis & mongodb support --- zmap.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/zmap.spec b/zmap.spec index 613ad8b..2c8d680 100644 --- a/zmap.spec +++ b/zmap.spec @@ -1,7 +1,5 @@ %global __cmake_in_source_build 1 %bcond_with pfring -%bcond_without hiredis -%bcond_with mongodb %bcond_without debug Name: zmap @@ -18,14 +16,8 @@ BuildRequires: flex BuildRequires: gengetopt BuildRequires: gmp-devel BuildRequires: libunistring-devel -%if %{with hiredis} -BuildRequires: hiredis-devel -%endif BuildRequires: json-c-devel BuildRequires: libpcap-devel -%if %{with mongodb} -BuildRequires: pkgconfig(libmongoc-1.0) -%endif %description ZMap is an open-source network scanner that enables researchers to easily @@ -50,12 +42,6 @@ scanning. %build %cmake -DWITH_JSON=ON \ -%if %{with mongodb} - -DWITH_MONGO=ON \ -%endif -%if %{with hiredis} - -DWITH_REDIS=ON \ -%endif -DWITH_PFRING=OFF %cmake_build From a82efab8de0d1160d25972a44c0f360173479a74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:13:44 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 041d450d2baca3a7af1ed79aae2314cb27a42f71 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 17 Jul 2024 00:18:23 -0300 Subject: [PATCH 07/15] update zmap to 4.2.0 fixes rhbz#2248610 --- .gitignore | 1 + sources | 2 +- zmap.spec | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f144235..d093722 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zmap-2.1.0.tar.gz /zmap-2.1.1.tar.gz /zmap-3.0.0.tar.gz +/zmap-4.2.0.tar.gz diff --git a/sources b/sources index c6f2a96..01a4317 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmap-3.0.0.tar.gz) = 3ea4d0e4052c2e4ab303f1ac8c35339bd3e282993b7bbd6b75d2a039df934e57f4d93883b5034c5d25e3f8b2e81f3a036cf1bf1fb2ad6620afa6f7fd3366b0f1 +SHA512 (zmap-4.2.0.tar.gz) = 97995626a0c7b0f0138095fea0f4d484d361a40db1e71bfa853062d4320bc83049d4fb30f87e648de2dfcc6c6ac6e0da28214507718584c25f1a6063715aa23c diff --git a/zmap.spec b/zmap.spec index 2c8d680..0e0f5a4 100644 --- a/zmap.spec +++ b/zmap.spec @@ -3,21 +3,22 @@ %bcond_without debug Name: zmap -Version: 3.0.0 +Version: 4.2.0 Release: %autorelease Summary: Network scanner for Internet-wide network studies License: ASL 2.0 URL: https://zmap.io Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: gcc BuildRequires: byacc BuildRequires: cmake BuildRequires: flex +BuildRequires: gcc BuildRequires: gengetopt BuildRequires: gmp-devel -BuildRequires: libunistring-devel BuildRequires: json-c-devel +BuildRequires: Judy-devel BuildRequires: libpcap-devel +BuildRequires: libunistring-devel %description ZMap is an open-source network scanner that enables researchers to easily From 98e5708b7b96187c68737066160db762760a714f Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 17 Jul 2024 00:28:58 -0300 Subject: [PATCH 08/15] build with recommended cmake settings for release --- zmap.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zmap.spec b/zmap.spec index 0e0f5a4..e61781e 100644 --- a/zmap.spec +++ b/zmap.spec @@ -42,7 +42,9 @@ scanning. %autosetup %build -%cmake -DWITH_JSON=ON \ +%cmake -DENABLE_DEVELOPMENT=OFF \ + -DENABLE_LOG_TRACE=OFF \ + -DWITH_JSON=ON \ -DWITH_PFRING=OFF %cmake_build From 0b2c9b88d43902bd72dfda37e3aa90012b20a1fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:55:26 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a9582be1da62cf4f853fc35604df39db16750c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 18:12:15 +0200 Subject: [PATCH 10/15] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zmap.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zmap.spec b/zmap.spec index e61781e..09c7f91 100644 --- a/zmap.spec +++ b/zmap.spec @@ -6,7 +6,8 @@ Name: zmap Version: 4.2.0 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 BuildRequires: byacc From 78d912466a624b880ae49b258abfaf631304c0af Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 9 Dec 2024 22:22:06 -0300 Subject: [PATCH 11/15] update zmap to 4.3.0 --- .gitignore | 1 + sources | 2 +- zmap.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d093722..f409cc6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zmap-2.1.1.tar.gz /zmap-3.0.0.tar.gz /zmap-4.2.0.tar.gz +/zmap-4.3.0.tar.gz diff --git a/sources b/sources index 01a4317..4c871e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmap-4.2.0.tar.gz) = 97995626a0c7b0f0138095fea0f4d484d361a40db1e71bfa853062d4320bc83049d4fb30f87e648de2dfcc6c6ac6e0da28214507718584c25f1a6063715aa23c +SHA512 (zmap-4.3.0.tar.gz) = 17741f9e40f1f72140b7e662941fe3552c47fc30fe422f9122786fa272e5726fff626aabeded23a28ad0f52a64f3b602e330e87bef44fe49477c32b852524d8b diff --git a/zmap.spec b/zmap.spec index 09c7f91..7d8df46 100644 --- a/zmap.spec +++ b/zmap.spec @@ -3,7 +3,7 @@ %bcond_without debug Name: zmap -Version: 4.2.0 +Version: 4.3.0 Release: %autorelease Summary: Network scanner for Internet-wide network studies # Automatically converted from old format: ASL 2.0 - review is highly recommended. From ef27361613ea168128796ab7e61e7c2ca43cad44 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 11 Dec 2024 23:30:50 -0300 Subject: [PATCH 12/15] update zmap to 4.3.1 --- .gitignore | 1 + sources | 2 +- zmap.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f409cc6..0b16e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /zmap-3.0.0.tar.gz /zmap-4.2.0.tar.gz /zmap-4.3.0.tar.gz +/zmap-4.3.1.tar.gz diff --git a/sources b/sources index 4c871e6..00d3408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmap-4.3.0.tar.gz) = 17741f9e40f1f72140b7e662941fe3552c47fc30fe422f9122786fa272e5726fff626aabeded23a28ad0f52a64f3b602e330e87bef44fe49477c32b852524d8b +SHA512 (zmap-4.3.1.tar.gz) = 940f15b485df50304eb7eaac582cd2cb60e072eb4b84438cb39cdf54fd7c6e06d224a3831e37b6e77b030e83da3c70b352cdf24e81eeb9a5bfb3beb78760b627 diff --git a/zmap.spec b/zmap.spec index 7d8df46..1f5118a 100644 --- a/zmap.spec +++ b/zmap.spec @@ -3,7 +3,7 @@ %bcond_without debug Name: zmap -Version: 4.3.0 +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. From c91fb9a5358ed9d2ddaebfc3e92acd661e7cf345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:50:11 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From de6363547a11b7be9cdb273210b5e226d9639268 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:19:53 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7a257e8ba6c89aeae0bc6acd39acb509de312cc7 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 9 Nov 2025 02:46:02 -0300 Subject: [PATCH 15/15] update to 4.3.4 --- .gitignore | 1 + sources | 2 +- zmap-bin-sbin-merge.patch | 11 +++++++++++ zmap.spec | 13 +++++++------ 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 zmap-bin-sbin-merge.patch diff --git a/.gitignore b/.gitignore index 0b16e1b..490495e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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 00d3408..917aac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zmap-4.3.1.tar.gz) = 940f15b485df50304eb7eaac582cd2cb60e072eb4b84438cb39cdf54fd7c6e06d224a3831e37b6e77b030e83da3c70b352cdf24e81eeb9a5bfb3beb78760b627 +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 1f5118a..3283837 100644 --- a/zmap.spec +++ b/zmap.spec @@ -3,13 +3,14 @@ %bcond_without debug Name: zmap -Version: 4.3.1 +Version: 4.3.4 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 @@ -40,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 \ @@ -61,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*