rpms/nmap
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use upstream patch

Browse Source
This commit is contained in:
Pavel Zhukov 2017-08-04 10:35:30 +02:00
parent 88b1917ff9
commit 9353dccefb
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
nmap-7.60-bundled_libssh2_libz.patch
View File

@ -1,48 +1,45 @@
commit 32153fe41b9a3f461326348f16c9a71c6d980e89 commit fd0db097498d5ff29f647508a80915d4d0e8d84a
Author: Pavel Zhukov <pzhukov@redhat.com> Author: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu Aug 3 13:18:01 2017 +0200 Date: Thu Aug 3 15:16:49 2017 +0000
Use nmap-libssh2 and nmap-zlib headers for included only Report appropriate zlib/libssh2 versions. Closes #957
Nmap specific libssh2/libz headers contain hardcoded version number thus
version information is incorrect if system version of library is chosen.
diff --git a/nmap.cc b/nmap.cc diff --git a/nmap.cc b/nmap.cc
index 512cb4a6e..79f7e77b5 100644 index 512cb4a6e..5345d7311 100644
--- a/nmap.cc --- a/nmap.cc
+++ b/nmap.cc +++ b/nmap.cc
@@ -182,11 +182,19 @@ @@ -182,11 +182,11 @@
#endif #endif
#if HAVE_LIBSSH2 #if HAVE_LIBSSH2
+#ifdef LIBSSH2_INCLUDED -#include "libssh2/libssh2v.h"
#include "libssh2/libssh2v.h" +#include <libssh2.h>
+#else
+#include "libssh2.h"
+#endif
#endif #endif
#if HAVE_LIBZ #if HAVE_LIBZ
+#ifdef ZLIB_INCLUDED -#include "libz/libzv.h"
#include "libz/libzv.h" +#include <zlib.h>
+#else
+#include "zlib.h"
+#endif
#endif #endif
/* To get the version number only. */ /* To get the version number only. */
@@ -2722,7 +2730,7 @@ static void display_nmap_version() { @@ -2720,9 +2720,9 @@ static void display_nmap_version() {
#if HAVE_LIBSSH2
#ifdef LIBSSH2_INCLUDED #ifdef LIBSSH2_INCLUDED
with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1)); - with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
+ with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
#else #else
- with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1)); - with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
+ with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0)); + with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
#endif #endif
#else #else
without.push_back("libssh2"); without.push_back("libssh2");
@@ -2732,7 +2740,7 @@ static void display_nmap_version() { @@ -2730,9 +2730,9 @@ static void display_nmap_version() {
#if HAVE_LIBZ
#ifdef ZLIB_INCLUDED #ifdef ZLIB_INCLUDED
with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1)); - with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
+ with.push_back(std::string("nmap-libz-") + get_word_or_quote(ZLIB_VERSION, 0));
#else #else
- with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1)); - with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
+ with.push_back(std::string("libz-") + get_word_or_quote(ZLIB_VERSION, 0)); + with.push_back(std::string("libz-") + get_word_or_quote(ZLIB_VERSION, 0));

6
nmap.spec
View File

@ -8,7 +8,7 @@ Name: nmap
Epoch: 2 Epoch: 2
Version: 7.60 Version: 7.60
#global prerelease TEST5 #global prerelease TEST5
Release: 6%{?dist} Release: 7%{?dist}
# Uses combination of licenses based on GPL license, but with extra modification # Uses combination of licenses based on GPL license, but with extra modification
# so it got its own license tag rhbz#1055861 # so it got its own license tag rhbz#1055861
License: Nmap License: Nmap
@ -28,6 +28,7 @@ Patch2: nmap-4.52-noms.patch
# upstream provided patch for rhbz#845005, not yet in upstream repository # upstream provided patch for rhbz#845005, not yet in upstream repository
Patch5: ncat_reg_stdin.diff Patch5: ncat_reg_stdin.diff
Patch6: nmap-6.25-displayerror.patch Patch6: nmap-6.25-displayerror.patch
## https://github.com/nmap/nmap/commit/fd0db097498d5ff29f647508a80915d4d0e8d84a
Patch7: nmap-7.60-bundled_libssh2_libz.patch Patch7: nmap-7.60-bundled_libssh2_libz.patch
URL: http://nmap.org/ URL: http://nmap.org/
@ -240,6 +241,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Thu Aug 3 2017 Pavel Zhukov <pzhukov@redhat.com> - 2:7.60-7 * Thu Aug 3 2017 Pavel Zhukov <pzhukov@redhat.com> - 2:7.60-7
- Use upstream patch
* Thu Aug 3 2017 Pavel Zhukov <pzhukov@redhat.com> - 2:7.60-6
- Fix library version for non-included libraries - Fix library version for non-included libraries
* Thu Aug 3 2017 Pavel Zhukov <pzhukov@redhat.com> - 2:7.60-4 * Thu Aug 3 2017 Pavel Zhukov <pzhukov@redhat.com> - 2:7.60-4