From b661a0d5ebaf7489160c7f6533c3e5795d059fa2 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Mar 02 2016 21:50:18 +0000
Subject: Merge master


---

diff --git a/.gitignore b/.gitignore
index 9ff0144..c66d056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /v1.1.2.tar.gz
 /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-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 e28dcd2..8c0391f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e740b54c88c29bb03494b986f440b51  zmap-1.2.1.tar.gz
+a37555ac2beda1dc6f3754b411be545e  zmap-2.1.1.tar.gz
diff --git a/zmap.spec b/zmap.spec
index e58df6b..4143f6e 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,5 +1,10 @@
+%bcond_with     pfring
+%bcond_without  hiredis
+%bcond_with     mongodb
+%bcond_without  debug
+
 Name:           zmap
-Version:        1.2.1
+Version:        2.1.1
 Release:        1%{?dist}
 Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
@@ -10,9 +15,14 @@ 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 
@@ -37,24 +47,59 @@ scanning.
 # RHEL6 ld is too old.
 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
+
 %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 %{?_smp_mflags}
 
 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 LICENSE README examples/
+%doc AUTHORS CHANGELOG.md README.md 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
+* 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
+
+* 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