From 885341ee1b5788d0fd379f05e9a7e52169e2de60 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Mon, 24 Feb 2014 10:33:02 +0800
Subject: [PATCH 01/52] RHEL6 doesn't support ldflags, and ENABLE_HARDENING
 seems doing wrong here.

---
 zmap.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 5411358..3334bc1 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -37,7 +37,7 @@ scanning.
 %patch0 -p1
 
 %build
-%cmake -DWITH_JSON=ON -DWITH_REDIS=ON
+%cmake -DWITH_JSON=ON -DWITH_REDIS=ON -DENABLE_HARDENING=OFF
 make %{?_smp_mflags}
 chmod 644 -v examples/udp-probes/*
 find ./examples/ -type f -exec sed -i 's/\r$//' {} ";"

From f2ed35a76af9cf6d2372ff77f33038d92c13bfb7 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Mon, 21 Jul 2014 16:12:57 +0800
Subject: [PATCH 02/52] Revert back.

---
 zmap.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index e92fa18..c83a7a7 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -37,7 +37,7 @@ scanning.
 
 %build
 %cmake -DWITH_JSON=ON -DWITH_REDIS=ON
-%make_build
+make %{?_smp_mflags}
 
 chmod 644 -v examples/udp-probes/*
 find ./examples/ -type f -exec sed -i 's/\r$//' {} ";"

From 18908cbb6b75136f82db8301a0586d3c4259ff1b Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Mon, 21 Jul 2014 16:16:29 +0800
Subject: [PATCH 03/52] RHEL6 ships something too old.

---
 zmap.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 054daae..e58df6b 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -34,9 +34,11 @@ scanning.
 
 %prep
 %setup -q
+# RHEL6 ld is too old.
+sed -i 's|-z relro -z now||g' CMakeLists.txt
 
 %build
-%cmake -DWITH_JSON=ON -DWITH_REDIS=ON -DENABLE_HARDENING=OFF
+%cmake -DWITH_JSON=ON -DWITH_REDIS=ON
 make %{?_smp_mflags}
 
 chmod 644 -v examples/udp-probes/*

From a5ea4017e2111be8ab9ac580bb6f505c42c9c996 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 11:45:47 +0000
Subject: [PATCH 04/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index e92fa18..bdaec2f 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,6 +1,6 @@
 Name:           zmap
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -53,6 +53,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} ";"
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* 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
 

From 877d704846d673e251657d626cc3099c26b444e1 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Mon, 23 Feb 2015 18:55:40 +0800
Subject: [PATCH 05/52] Rebuilt for hiredis 0.12.1

---
 zmap.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zmap.spec b/zmap.spec
index bdaec2f..b23a0ef 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,6 +1,6 @@
 Name:           zmap
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -46,13 +46,17 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} ";"
 %make_install
 
 %files
-%doc AUTHORS CHANGELOG LICENSE README examples/
+%doc AUTHORS CHANGELOG README examples/
+%license LICENSE
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* 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
 

From 785fdc2f16b9e33f461550afe9b95c094fe29b21 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 04:49:33 +0000
Subject: [PATCH 06/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index b23a0ef..2ceba41 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,6 +1,6 @@
 Name:           zmap
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -54,6 +54,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} ";"
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sun Feb 22 2015 Christopher Meng <rpm@cicku.me> - 1.2.1-3
 - Rebuilt for hiredis 0.12.1
 

From 457aea64739d169aa7751ceb2683373fe56d3bf9 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Sat, 5 Sep 2015 17:27:37 +0800
Subject: [PATCH 07/52] Update to 2.1.0

---
 .gitignore                              |  1 +
 0001-Fix-broken-conf-installation.patch | 44 +++++++++++++++++++++++++
 sources                                 |  2 +-
 zmap.spec                               | 43 ++++++++++++++++++++----
 4 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 0001-Fix-broken-conf-installation.patch

diff --git a/.gitignore b/.gitignore
index 9ff0144..4da8154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /v1.1.2.tar.gz
 /zmap-1.2.0.tar.gz
 /zmap-1.2.1.tar.gz
+/zmap-2.1.0.tar.gz
diff --git a/0001-Fix-broken-conf-installation.patch b/0001-Fix-broken-conf-installation.patch
new file mode 100644
index 0000000..a217edf
--- /dev/null
+++ b/0001-Fix-broken-conf-installation.patch
@@ -0,0 +1,44 @@
+From 7940d5311eb0f869bac2e7a9561ba22f69a05424 Mon Sep 17 00:00:00 2001
+From: Christopher Meng <i@cicku.me>
+Date: Sat, 5 Sep 2015 17:14:58 +0800
+Subject: [PATCH] Fix broken conf installation
+
+install(SCRIPT) doesn't read variable from project cmakefile, instead of hacking more on this single file with less than 10 lines, why not merge back to one file?
+---
+ CMakeLists.txt | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2afb37..6a06cbf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -124,14 +124,24 @@ add_subdirectory(src)
+ 
+ # Install conf files
+ 
+-FILE(GLOB CONF_FILES "${PROJECT_SOURCE_DIR}/conf/*")
+ if (RESPECT_INSTALL_PREFIX_CONFIG)
+     set(CONFIG_DESTINATION "etc/zmap")
+ else()
+     set(CONFIG_DESTINATION "/etc/zmap")
+ endif()
+ 
+-install(SCRIPT InstallConfFiles.cmake)
++FILE(GLOB CONF_FILES "${PROJECT_SOURCE_DIR}/conf/*")
++
++foreach(EACH_CONF ${CONF_FILES})
++    get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
++    message(STATUS "Default ZMap configuration file location is /etc/zmap")
++    message(STATUS "Checking if ${CONF_BASENAME} exists there...")
++    if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}")
++        install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
++    else()
++        message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, it will NOT be installed. Please check and install manually!")
++    endif()
++endforeach()
+ 
+ # Allow Debian Packaging
+ INCLUDE (InstallRequiredSystemLibraries)
+-- 
+2.5.1
+
diff --git a/sources b/sources
index e28dcd2..863207f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e740b54c88c29bb03494b986f440b51  zmap-1.2.1.tar.gz
+0e6b9b0628eb1d3360fbd9ea56e36693  zmap-2.1.0.tar.gz
diff --git a/zmap.spec b/zmap.spec
index 2ceba41..85e1100 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,18 +1,29 @@
+%bcond_with     pfring
+%bcond_without  hiredis
+%bcond_with     mongodb
+%bcond_without  debug
+
 Name:           zmap
-Version:        1.2.1
-Release:        4%{?dist}
+Version:        2.1.0
+Release:        1%{?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
+Patch0:         0001-Fix-broken-conf-installation.patch
 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 
@@ -34,26 +45,44 @@ scanning.
 
 %prep
 %setup -q
+%patch0 -p1
+# Custom flags from upstream should be put in the front as preferred.
+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 -DWITH_REDIS=ON
+%cmake -DWITH_JSON=ON     \
+%if %{with mongodb}
+       -DWITH_MONGO=ON    \
+%endif
+%if %{with hiredis}
+       -DWITH_REDIS=ON    \
+%endif
+       -DWITH_PFRING=OFF
+
 %make_build
 
 chmod 644 -v examples/udp-probes/*
-find ./examples/ -type f -exec sed -i 's/\r$//' {} ";"
+find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 
 %install
 %make_install
 
 %files
-%doc AUTHORS CHANGELOG README examples/
+%doc AUTHORS CHANGELOG README* examples/
 %license LICENSE
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
-%{_sbindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%{_sbindir}/zmap
+%{_sbindir}/zblacklist
+%{_sbindir}/ztee
+%{_mandir}/man1/zmap.1*
+%{_mandir}/man1/zblacklist.1*
+%{_mandir}/man1/ztee.1*
 
 %changelog
+* Thu Sep 03 2015 Christopher Meng <rpm@cicku.me> - 2.1.0-1
+- Update to 2.1.0
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 7c10a721e0c2e5e8809e88eaadb57c4517ec2d7a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 29 Sep 2015 07:46:56 +0000
Subject: [PATCH 08/52] rebuild (hiredis)

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 85e1100..ce2051c 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -80,6 +80,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From ff100aaa7ce8e0d8d15f9fd5a70cb7bb2a2b7d98 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 04:08:02 +0000
Subject: [PATCH 09/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index ce2051c..50d0a04 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -80,6 +80,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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)
 

From f79b5855ee45865aa8444409a97da2f14d75f5ef Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Wed, 2 Mar 2016 21:35:20 +0000
Subject: [PATCH 10/52] 2.1.1-1 Cleanup the spec and update to current release

---
 .gitignore                                |  1 +
 0001-Fix-broken-conf-installation.patch   | 44 -----------------------
 0001-Respect-DESTDIR-during-install.patch | 24 -------------
 sources                                   |  2 +-
 zmap.spec                                 | 16 +++++----
 5 files changed, 12 insertions(+), 75 deletions(-)
 delete mode 100644 0001-Fix-broken-conf-installation.patch
 delete mode 100644 0001-Respect-DESTDIR-during-install.patch

diff --git a/.gitignore b/.gitignore
index 4da8154..c66d056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /zmap-1.2.0.tar.gz
 /zmap-1.2.1.tar.gz
 /zmap-2.1.0.tar.gz
+/zmap-2.1.1.tar.gz
diff --git a/0001-Fix-broken-conf-installation.patch b/0001-Fix-broken-conf-installation.patch
deleted file mode 100644
index a217edf..0000000
--- a/0001-Fix-broken-conf-installation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7940d5311eb0f869bac2e7a9561ba22f69a05424 Mon Sep 17 00:00:00 2001
-From: Christopher Meng <i@cicku.me>
-Date: Sat, 5 Sep 2015 17:14:58 +0800
-Subject: [PATCH] Fix broken conf installation
-
-install(SCRIPT) doesn't read variable from project cmakefile, instead of hacking more on this single file with less than 10 lines, why not merge back to one file?
----
- CMakeLists.txt | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d2afb37..6a06cbf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,14 +124,24 @@ add_subdirectory(src)
- 
- # Install conf files
- 
--FILE(GLOB CONF_FILES "${PROJECT_SOURCE_DIR}/conf/*")
- if (RESPECT_INSTALL_PREFIX_CONFIG)
-     set(CONFIG_DESTINATION "etc/zmap")
- else()
-     set(CONFIG_DESTINATION "/etc/zmap")
- endif()
- 
--install(SCRIPT InstallConfFiles.cmake)
-+FILE(GLOB CONF_FILES "${PROJECT_SOURCE_DIR}/conf/*")
-+
-+foreach(EACH_CONF ${CONF_FILES})
-+    get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
-+    message(STATUS "Default ZMap configuration file location is /etc/zmap")
-+    message(STATUS "Checking if ${CONF_BASENAME} exists there...")
-+    if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}")
-+        install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
-+    else()
-+        message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, it will NOT be installed. Please check and install manually!")
-+    endif()
-+endforeach()
- 
- # Allow Debian Packaging
- INCLUDE (InstallRequiredSystemLibraries)
--- 
-2.5.1
-
diff --git a/0001-Respect-DESTDIR-during-install.patch b/0001-Respect-DESTDIR-during-install.patch
deleted file mode 100644
index 94bc006..0000000
--- a/0001-Respect-DESTDIR-during-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d1d911ca481a7d687df847e1ed826f73665614ba Mon Sep 17 00:00:00 2001
-From: Christopher Meng <i@cicku.me>
-Date: Mon, 27 Jan 2014 17:44:31 +0800
-Subject: [PATCH 3/3] Respect DESTDIR during install.
-
----
- zmap_conf_install.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
-index c1b2f61..ec0745e 100644
---- a/zmap_conf_install.cmake.in
-+++ b/zmap_conf_install.cmake.in
-@@ -1,6 +1,6 @@
- message(STATUS "Creating /etc/zmap")
- if (NOT EXISTS "/etc/zmap/")
--        file(MAKE_DIRECTORY "/etc/zmap")
-+        file(INSTALL DESTINATION "/etc/zmap")
- else()
-         message(STATUS "/etc/zmap exists, skipping...")
- endif()
--- 
-1.8.5.3
-
diff --git a/sources b/sources
index 863207f..8c0391f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e6b9b0628eb1d3360fbd9ea56e36693  zmap-2.1.0.tar.gz
+a37555ac2beda1dc6f3754b411be545e  zmap-2.1.1.tar.gz
diff --git a/zmap.spec b/zmap.spec
index 50d0a04..6dd4ffd 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -4,13 +4,13 @@
 %bcond_without  debug
 
 Name:           zmap
-Version:        2.1.0
-Release:        3%{?dist}
+Version:        2.1.1
+Release:        1%{?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
-Patch0:         0001-Fix-broken-conf-installation.patch
+#Patch0:         0001-Fix-broken-conf-installation.patch
 BuildRequires:  byacc
 BuildRequires:  cmake
 BuildRequires:  flex
@@ -45,8 +45,8 @@ scanning.
 
 %prep
 %setup -q
-%patch0 -p1
-# Custom flags from upstream should be put in the front as preferred.
+#%patch0 -p1
+# 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
@@ -68,7 +68,7 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %make_install
 
 %files
-%doc AUTHORS CHANGELOG README* examples/
+%doc AUTHORS CHANGELOG.md README.md examples/
 %license LICENSE
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
@@ -80,6 +80,10 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* Thu Mar 02 2016 Fabio Alessandro Locati <fabio@locati.cc> - 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
 

From bec9502d20be56d27e837a0f2ffaeec1a4485a0c Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Wed, 2 Mar 2016 21:44:28 +0000
Subject: [PATCH 11/52] Fix bogus date and remove commented code

---
 zmap.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/zmap.spec b/zmap.spec
index 6dd4ffd..e3caf81 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -10,7 +10,6 @@ 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
-#Patch0:         0001-Fix-broken-conf-installation.patch
 BuildRequires:  byacc
 BuildRequires:  cmake
 BuildRequires:  flex
@@ -45,7 +44,6 @@ scanning.
 
 %prep
 %setup -q
-#%patch0 -p1
 # 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
 
@@ -80,7 +78,7 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
-* Thu Mar 02 2016 Fabio Alessandro Locati <fabio@locati.cc> - 2.1.1-1
+* Wed Mar 02 2016 Fabio Alessandro Locati <fabio@locati.cc> - 2.1.1-1
 - Update to 2.1.1
 - Clean the spec a little bit
 

From 9dd93a892c2247175e90ac35937d7c0c1f4f4825 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Wed, 2 Mar 2016 22:02:03 +0000
Subject: [PATCH 12/52] Make it better

---
 zmap.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zmap.spec b/zmap.spec
index 4143f6e..3f7f32e 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -44,8 +44,9 @@ scanning.
 
 %prep
 %setup -q
-# RHEL6 ld is too old.
-sed -i 's|-z relro -z now||g' CMakeLists.txt
+# RHEL ld is too old.
+%{?el6:sed -i 's|-z relro -z now||g' CMakeLists.txt}
+%{?el7:sed -i 's|-z relro -z now||g' CMakeLists.txt}
 
 # 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

From d3f5e416b45aaddee9f3d8018158914179cdd459 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Wed, 2 Mar 2016 22:10:26 +0000
Subject: [PATCH 13/52] Actually not needed

---
 zmap.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zmap.spec b/zmap.spec
index 3f7f32e..eb3051c 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -44,9 +44,8 @@ scanning.
 
 %prep
 %setup -q
-# RHEL ld is too old.
+# RHEL6 ld is too old.
 %{?el6:sed -i 's|-z relro -z now||g' CMakeLists.txt}
-%{?el7:sed -i 's|-z relro -z now||g' CMakeLists.txt}
 
 # 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

From 66929f178adc32ed7f978ce925783e3f493fb4cf Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Wed, 2 Mar 2016 22:22:12 +0000
Subject: [PATCH 14/52] Fix for EL7

---
 zmap.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zmap.spec b/zmap.spec
index eb3051c..d7d48cb 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -46,6 +46,8 @@ scanning.
 %setup -q
 # RHEL6 ld is too old.
 %{?el6:sed -i 's|-z relro -z now||g' CMakeLists.txt}
+# EL7 has 2.8.11
+%{?el7:sed -i -e 's|2.8.12|2.8.11|' CMakeLists.txt}
 
 # 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

From dd90df0c832305c5e36e35986aab15dad830c5dc Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <me@fale.io>
Date: Sun, 25 Dec 2016 12:11:04 +0100
Subject: [PATCH 15/52] Fix email address

---
 zmap.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index d7d48cb..b3fb1dd 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -83,7 +83,7 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
-* Wed Mar 02 2016 Fabio Alessandro Locati <fabio@locati.cc> - 2.1.1-1
+* 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
 

From 9f90fc592b0cac5c8c13bbfb0bb3df688101161d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 18:26:07 +0000
Subject: [PATCH 16/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index b3fb1dd..a568a2b 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -83,6 +83,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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

From 07bc3dc661ca1b108ff53c7801d05c5a4633fac3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 22:44:56 +0000
Subject: [PATCH 17/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index a568a2b..b1aaf41 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -83,6 +83,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 14bac42aaf3d30ad7cd64cdae2d09d96e2f3e9a8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 11:12:51 +0000
Subject: [PATCH 18/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index b1aaf41..75bb7c9 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -83,6 +83,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From fd887cf12163b9207ee5b1ef2638d1b1a9162d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sun, 10 Dec 2017 20:50:44 +0100
Subject: [PATCH 19/52] Rebuilt for libjson-c.so.3

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 75bb7c9..54555c5 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -83,6 +83,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 9baebdef415ba42517f7ad226379ab54a4c692a6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 22:30:31 +0000
Subject: [PATCH 20/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 54555c5..93b6526 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -83,6 +83,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 88a9301389da27818997256113ddaa62e5e96b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Tue, 6 Mar 2018 15:16:50 +0100
Subject: [PATCH 21/52] Rebuilt for libjson-c.so.4 (json-c v0.13.1)

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 93b6526..caf35ec 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -83,6 +83,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From dc6659a4dfe8b922b2b8923ef720acc1cdb6a27a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Mon, 9 Jul 2018 19:06:54 +0200
Subject: [PATCH 22/52] add BuildRequires: gcc

Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
---
 zmap.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zmap.spec b/zmap.spec
index caf35ec..bdab9b6 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -10,6 +10,7 @@ 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

From 47265fff4cd070e6844206708b629760362fa309 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 09:52:14 +0000
Subject: [PATCH 23/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index bdab9b6..68f7bf0 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -84,6 +84,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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)
 

From 91467e64b785e8d915191871afd7e7510d40a446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 23 Jan 2019 09:34:30 +0100
Subject: [PATCH 24/52] Append curdir to CMake invokation. (#1668512)

---
 zmap.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zmap.spec b/zmap.spec
index 68f7bf0..8743e7c 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -61,7 +61,8 @@ sed -i 's|${CMAKE_C_FLAGS} ${GCCWARNINGS}|${GCCWARNINGS} ${CMAKE_C_FLAGS}|g;s|${
 %if %{with hiredis}
        -DWITH_REDIS=ON    \
 %endif
-       -DWITH_PFRING=OFF
+       -DWITH_PFRING=OFF  \
+       .
 
 make %{?_smp_mflags}
 
@@ -84,6 +85,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 45cdc861052750386b39b06f9c653e9cd0e33d7d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 13:13:43 +0000
Subject: [PATCH 25/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 8743e7c..22fb56e 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -85,6 +85,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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)
 

From 71a28998878efefa1666e74edd7aaa9dcca0f35b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 05:03:33 +0000
Subject: [PATCH 26/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 22fb56e..e5ee313 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -85,6 +85,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 98233214fb7fd9bb5f91385ad96b5583d79dd0bf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 05:22:11 +0000
Subject: [PATCH 27/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index e5ee313..f851b4d 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -85,6 +85,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 9d04fbbdbec6e63130ab54cd7b5b8eb6490cd04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 22 Apr 2020 00:14:52 +0200
Subject: [PATCH 28/52] Rebuild (json-c)

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index f851b4d..bfcb5bf 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,7 +5,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
@@ -85,6 +85,9 @@ find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 %{_mandir}/man1/ztee.1*
 
 %changelog
+* 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
 

From 4eb8a3864025eead9820e929da57557e399f81ff Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Sun, 5 Jul 2020 19:25:19 +0200
Subject: [PATCH 29/52] Improve compatibility with new CMake macro

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 zmap.spec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/zmap.spec b/zmap.spec
index bfcb5bf..c8b4cba 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,3 +1,4 @@
+%global __cmake_in_source_build 1
 %bcond_with     pfring
 %bcond_without  hiredis
 %bcond_with     mongodb
@@ -45,10 +46,6 @@ scanning.
 
 %prep
 %setup -q
-# RHEL6 ld is too old.
-%{?el6:sed -i 's|-z relro -z now||g' CMakeLists.txt}
-# EL7 has 2.8.11
-%{?el7:sed -i -e 's|2.8.12|2.8.11|' CMakeLists.txt}
 
 # 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
@@ -61,16 +58,15 @@ sed -i 's|${CMAKE_C_FLAGS} ${GCCWARNINGS}|${GCCWARNINGS} ${CMAKE_C_FLAGS}|g;s|${
 %if %{with hiredis}
        -DWITH_REDIS=ON    \
 %endif
-       -DWITH_PFRING=OFF  \
-       .
+       -DWITH_PFRING=OFF
 
-make %{?_smp_mflags}
+%cmake_build
 
 chmod 644 -v examples/udp-probes/*
 find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 
 %install
-%make_install
+%cmake_install
 
 %files
 %doc AUTHORS CHANGELOG.md README.md examples/

From 5c13b06c6392d12cf6dcbd2b294d1244b5dffd28 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 15:25:57 +0000
Subject: [PATCH 30/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index c8b4cba..cbe4308 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        13%{?dist}
+Release:        14%{?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
+* 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)
 

From 3afaad49cdf1bd5a86b755899e0fc94e212319f0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 28 Jan 2021 00:44:35 +0000
Subject: [PATCH 31/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index cbe4308..97f5004 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        14%{?dist}
+Release:        15%{?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
+* 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
 

From 1056702a6828b035d4692d3aa06639ecc82dc9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 10 Jul 2021 11:59:22 +0200
Subject: [PATCH 32/52] Rebuild for versioned symbols in json-c

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 97f5004..87ff625 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        15%{?dist}
+Release:        16%{?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 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
 

From d0bb803ad9f5183d56fda2b78c6ca551ef66e643 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 22:20:50 +0000
Subject: [PATCH 33/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 87ff625..f393bf1 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        16%{?dist}
+Release:        17%{?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
+* 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
 

From f5d73cd3aab8d534b47137f82a22722fe684a8cb Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 17 Jan 2022 17:10:42 -0800
Subject: [PATCH 34/52] Rebuild for hiredis 1.0.2

---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index f393bf1..397bafd 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        17%{?dist}
+Release:        18%{?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
+* 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
 

From a62368bc5e0f7851497695a0b7db5bd7a084a7bc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 05:54:26 +0000
Subject: [PATCH 35/52] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 397bafd..97eed25 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        18%{?dist}
+Release:        19%{?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 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
 

From e498aa249553ab8f34d28c5559ad6305f2da7496 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 13:58:21 +0000
Subject: [PATCH 36/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 97eed25..3098872 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        19%{?dist}
+Release:        20%{?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 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
 

From 59d1cc215166686cc73d654fdd49cfd66dbb90b0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 08:19:00 +0000
Subject: [PATCH 37/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zmap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zmap.spec b/zmap.spec
index 3098872..0f68b5b 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -6,7 +6,7 @@
 
 Name:           zmap
 Version:        2.1.1
-Release:        20%{?dist}
+Release:        21%{?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 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
 

From ebf3d4c35949e504af7b7218a227ccc47d1a7f07 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 19:45:25 +0000
Subject: [PATCH 38/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <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
 

From 5901c797b3a75e6552a92590201c2d0203595785 Mon Sep 17 00:00:00 2001
From: Filipe Rosset <rosset.filipe@gmail.com>
Date: Wed, 9 Aug 2023 23:26:10 -0300
Subject: [PATCH 39/52] 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 <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.
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 <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.
+%autochangelog

From 944ac912e49ecb5eb1224a30e599685b7877af73 Mon Sep 17 00:00:00 2001
From: Filipe Rosset <rosset.filipe@gmail.com>
Date: Wed, 9 Aug 2023 23:28:41 -0300
Subject: [PATCH 40/52] 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 <releng@fedoraproject.org> - 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 <rosset.filipe@gmail.com>
Date: Wed, 9 Aug 2023 23:48:10 -0300
Subject: [PATCH 41/52] 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 <rosset.filipe@gmail.com>
Date: Wed, 9 Aug 2023 23:56:09 -0300
Subject: [PATCH 42/52] 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 <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 11:13:44 +0000
Subject: [PATCH 43/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From 041d450d2baca3a7af1ed79aae2314cb27a42f71 Mon Sep 17 00:00:00 2001
From: Filipe Rosset <rosset.filipe@gmail.com>
Date: Wed, 17 Jul 2024 00:18:23 -0300
Subject: [PATCH 44/52] 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 <rosset.filipe@gmail.com>
Date: Wed, 17 Jul 2024 00:28:58 -0300
Subject: [PATCH 45/52] 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 <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 10:55:26 +0000
Subject: [PATCH 46/52] 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?= <msuchy@redhat.com>
Date: Wed, 24 Jul 2024 18:12:15 +0200
Subject: [PATCH 47/52] 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 <rosset.filipe@gmail.com>
Date: Mon, 9 Dec 2024 22:22:06 -0300
Subject: [PATCH 48/52] 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 <rosset.filipe@gmail.com>
Date: Wed, 11 Dec 2024 23:30:50 -0300
Subject: [PATCH 49/52] 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 <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 16:50:11 +0000
Subject: [PATCH 50/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From de6363547a11b7be9cdb273210b5e226d9639268 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 21:19:53 +0000
Subject: [PATCH 51/52] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 7a257e8ba6c89aeae0bc6acd39acb509de312cc7 Mon Sep 17 00:00:00 2001
From: Filipe Rosset <rosset.filipe@gmail.com>
Date: Sun, 9 Nov 2025 02:46:02 -0300
Subject: [PATCH 52/52] 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*