update to 4.3.4

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -5,3 +5,8 @@
 /zmap-1.2.1.tar.gz
 /zmap-2.1.0.tar.gz
 /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

changelog

@@ -0,0 +1,107 @@
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 18 2022 Kevin Fenzi <kevin@scrye.com> - 2.1.1-18
+- Rebuild for hiredis 1.0.2
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 2.1.1-16
+- Rebuild for versioned symbols in json-c
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 2.1.1-13
+- Rebuild (json-c)
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Björn Esser <besser82@fedoraproject.org> - 2.1.1-9
+- Append curdir to CMake invokation. (#1668512)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 2.1.1-7
+- Rebuilt for libjson-c.so.4 (json-c v0.13.1)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.1.1-5
+- Rebuilt for libjson-c.so.3
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Mar 02 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 2.1.1-1
+- Update to 2.1.1
+- Clean the spec a little bit
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Sep 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.0-2
+- rebuild (hiredis)
+
+* Thu Sep 03 2015 Christopher Meng <rpm@cicku.me> - 2.1.0-1
+- Update to 2.1.0
+
+* Sun Feb 22 2015 Christopher Meng <rpm@cicku.me> - 1.2.1-3
+- Rebuilt for hiredis 0.12.1
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jul 20 2014 Christopher Meng <rpm@cicku.me> - 1.2.1-1
+- Update to 1.2.1
+
+* Wed Mar 12 2014 Christopher Meng <rpm@cicku.me> - 1.2.0-1
+- Update to 1.2.0
+
+* Mon Jan 27 2014 Christopher Meng <rpm@cicku.me> - 1.1.2-1
+- Update to 1.1.2
+
+* Thu Dec 19 2013 Christopher Meng <rpm@cicku.me> - 1.1.1-1
+- Update to 1.1.1
+
+* Fri Nov 22 2013 Christopher Meng <rpm@cicku.me> - 1.1.0-2
+- Set 644 to examples.
+- Fix wrong line endings.
+
+* Tue Nov 19 2013 Christopher Meng <rpm@cicku.me> - 1.1.0-1
+- Update to 1.1.0
+- Enable harden building.
+
+* Mon Aug 26 2013 Christopher Meng <rpm@cicku.me> - 1.0.3-2
+- Correct the license and summary.
+
+* Mon Aug 19 2013 Christopher Meng <rpm@cicku.me> - 1.0.3-1
+- Initial Package.

sources

@@ -1 +1 @@
-a37555ac2beda1dc6f3754b411be545e  zmap-2.1.1.tar.gz
+SHA512 (zmap-4.3.4.tar.gz) = 225b79e795b0925f59e727b02455e087dc4a559190f76eaf96155c5f10aba02334de0ba685539b029a684d4f4bb61ce084ba825d766f6b0fa1ced17c773f4df7

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

zmap.spec

@@ -1,30 +1,26 @@
 %global __cmake_in_source_build 1
 %bcond_with     pfring
-%bcond_without  hiredis
-%bcond_with     mongodb
 %bcond_without  debug
 
 Name:           zmap
-Version:        2.1.1
+Version:        4.3.4
-Release:        21%{?dist}
+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:  gcc
+Patch0:         zmap-bin-sbin-merge.patch
 BuildRequires:  byacc
 BuildRequires:  cmake
 BuildRequires:  flex
+BuildRequires:  gcc
 BuildRequires:  gengetopt
 BuildRequires:  gmp-devel
-%if %{with hiredis}
-BuildRequires:  hiredis-devel
-%endif
 BuildRequires:  json-c-devel
+BuildRequires:  Judy-devel
 BuildRequires:  libpcap-devel
-%if %{with mongodb}
+BuildRequires:  libunistring-devel
-BuildRequires:  pkgconfig(libmongoc-1.0)
-%endif
 
 %description
 ZMap is an open-source network scanner that enables researchers to easily 
@@ -45,19 +41,12 @@ respect requests to stop scanning and to exclude these networks from ongoing
 scanning.
 
 %prep
-%setup -q
+%autosetup -p 0
-
-# 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     \
+%cmake -DENABLE_DEVELOPMENT=OFF           \
-%if %{with mongodb}
+       -DENABLE_LOG_TRACE=OFF             \
-       -DWITH_MONGO=ON    \
+       -DWITH_JSON=ON                     \
-%endif
-%if %{with hiredis}
-       -DWITH_REDIS=ON    \
-%endif
        -DWITH_PFRING=OFF
 
 %cmake_build
@@ -73,115 +62,14 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %license LICENSE
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
-%{_sbindir}/zmap
+%{_bindir}/zmap
-%{_sbindir}/zblacklist
+%{_bindir}/zblocklist
-%{_sbindir}/ztee
+%{_bindir}/ziterate
+%{_bindir}/ztee
 %{_mandir}/man1/zmap.1*
-%{_mandir}/man1/zblacklist.1*
+%{_mandir}/man1/zblocklist.1*
+%{_mandir}/man1/ziterate.1*
 %{_mandir}/man1/ztee.1*
 
 %changelog
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-21
+%autochangelog
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 18 2022 Kevin Fenzi <kevin@scrye.com> - 2.1.1-18
-- Rebuild for hiredis 1.0.2
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 2.1.1-16
-- Rebuild for versioned symbols in json-c
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 2.1.1-13
-- Rebuild (json-c)
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Björn Esser <besser82@fedoraproject.org> - 2.1.1-9
-- Append curdir to CMake invokation. (#1668512)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 2.1.1-7
-- Rebuilt for libjson-c.so.4 (json-c v0.13.1)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.1.1-5
-- Rebuilt for libjson-c.so.3
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Mar 02 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 2.1.1-1
-- Update to 2.1.1
-- Clean the spec a little bit
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Sep 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.0-2
-- rebuild (hiredis)
-
-* Thu Sep 03 2015 Christopher Meng <rpm@cicku.me> - 2.1.0-1
-- Update to 2.1.0
-
-* Sun Feb 22 2015 Christopher Meng <rpm@cicku.me> - 1.2.1-3
-- Rebuilt for hiredis 0.12.1
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jul 20 2014 Christopher Meng <rpm@cicku.me> - 1.2.1-1
-- Update to 1.2.1
-
-* Wed Mar 12 2014 Christopher Meng <rpm@cicku.me> - 1.2.0-1
-- Update to 1.2.0
-
-* Mon Jan 27 2014 Christopher Meng <rpm@cicku.me> - 1.1.2-1
-- Update to 1.1.2
-
-* Thu Dec 19 2013 Christopher Meng <rpm@cicku.me> - 1.1.1-1
-- Update to 1.1.1
-
-* Fri Nov 22 2013 Christopher Meng <rpm@cicku.me> - 1.1.0-2
-- Set 644 to examples.
-- Fix wrong line endings.
-
-* Tue Nov 19 2013 Christopher Meng <rpm@cicku.me> - 1.1.0-1
-- Update to 1.1.0
-- Enable harden building.
-
-* Mon Aug 26 2013 Christopher Meng <rpm@cicku.me> - 1.0.3-2
-- Correct the license and summary.
-
-* Mon Aug 19 2013 Christopher Meng <rpm@cicku.me> - 1.0.3-1
-- Initial Package.