Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
I would like to update nmap in jessie, fixing a packaging issue with the
ndiff package that renders it unusable (unless zenmap which pulls in a
bunch of GUI-related libraries is also installed) and two upstream
issues that make the nmap itself unusable under certain conditions.
nmap (6.47-3+deb8u1) jessie; urgency=medium
* Added upstream patch to deal with unuseable socks proxy (Closes:
#773817)
* Apply patch by Jan Nordholz to ignore unenumerable interfaces (Closes:
#821913)
* Moved ndiff.py from zenmap to ndiff, added versioned Breaks/Replaces
(Closes: #789776, #789897)
-- Hilko Bengen <ben...@debian.org> Tue, 24 May 2016 22:04:40 +0200
Cheers,
-Hilko
diff -Nru nmap-6.47/debian/changelog nmap-6.47/debian/changelog
--- nmap-6.47/debian/changelog 2014-10-11 19:37:20.000000000 +0200
+++ nmap-6.47/debian/changelog 2016-05-24 22:05:41.000000000 +0200
@@ -1,3 +1,14 @@
+nmap (6.47-3+deb8u1) jessie; urgency=medium
+
+ * Added upstream patch to deal with unuseable socks proxy (Closes:
+ #773817)
+ * Apply patch by Jan Nordholz to ignore unenumerable interfaces (Closes:
+ #821913)
+ * Moved ndiff.py from zenmap to ndiff, added versioned Breaks/Replaces
+ (Closes: #789776, #789897)
+
+ -- Hilko Bengen <ben...@debian.org> Tue, 24 May 2016 22:04:40 +0200
+
nmap (6.47-3) unstable; urgency=medium
* Updated German translation of zenmap, thanks to Chris Leick (Closes:
diff -Nru nmap-6.47/debian/control nmap-6.47/debian/control
--- nmap-6.47/debian/control 2014-10-11 19:36:35.000000000 +0200
+++ nmap-6.47/debian/control 2016-05-24 22:01:36.000000000 +0200
@@ -54,6 +54,8 @@
Architecture: all
Recommends: nmap
Conflicts: nmap (<< ${source:Version})
+Breaks: zenmap (<< 6.47-5~)
+Replaces: zenmap (<< 6.47-5~)
Depends: ${python:Depends}, ${misc:Depends}, python-lxml,
Description: The Network Mapper - result compare utility
Ndiff is a tool to aid in the comparison of Nmap scans. It takes two
diff -Nru nmap-6.47/debian/ndiff.install nmap-6.47/debian/ndiff.install
--- nmap-6.47/debian/ndiff.install 2014-05-30 21:40:10.000000000 +0200
+++ nmap-6.47/debian/ndiff.install 2016-05-24 21:06:33.000000000 +0200
@@ -1,2 +1,3 @@
usr/bin/ndiff
usr/share/man/man1/ndiff.1
+usr/lib/python2.7/*/ndiff.py
diff -Nru nmap-6.47/debian/patches/0004-Fail-early-when-unable-to-properly-resolve-proxy-nam.patch nmap-6.47/debian/patches/0004-Fail-early-when-unable-to-properly-resolve-proxy-nam.patch
--- nmap-6.47/debian/patches/0004-Fail-early-when-unable-to-properly-resolve-proxy-nam.patch 1970-01-01 01:00:00.000000000 +0100
+++ nmap-6.47/debian/patches/0004-Fail-early-when-unable-to-properly-resolve-proxy-nam.patch 2016-05-24 21:05:44.000000000 +0200
@@ -0,0 +1,31 @@
+From: Hilko Bengen <ben...@debian.org>
+Date: Mon, 27 Apr 2015 00:05:21 +0200
+Subject: Fail early when unable to properly resolve proxy names.
+
+This is a backported patch from r33198 from upstream SVN.
+---
+ nsock/src/nsock_proxy.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c
+index 4850869..8b19ef2 100644
+--- a/nsock/src/nsock_proxy.c
++++ b/nsock/src/nsock_proxy.c
+@@ -368,7 +368,7 @@ static struct proxy_node *proxy_node_new(char *proxystr) {
+ break;
+
+ if (pspec->ops->node_new(&proxy, &uri) < 0)
+- proxy = NULL;
++ fatal("Cannot initialize proxy node %s", proxystr);
+
+ uri_free(&uri);
+
+@@ -455,7 +455,7 @@ int proxy_resolve(const char *host, struct sockaddr *addr, size_t *addrlen) {
+
+ rc = getaddrinfo(host, NULL, NULL, &res);
+ if (rc)
+- return -rc;
++ return -abs(rc);
+
+ *addr = *res->ai_addr;
+ *addrlen = res->ai_addrlen;
diff -Nru nmap-6.47/debian/patches/0005-Ignore-errors-when-enumerating-interfaces.patch nmap-6.47/debian/patches/0005-Ignore-errors-when-enumerating-interfaces.patch
--- nmap-6.47/debian/patches/0005-Ignore-errors-when-enumerating-interfaces.patch 1970-01-01 01:00:00.000000000 +0100
+++ nmap-6.47/debian/patches/0005-Ignore-errors-when-enumerating-interfaces.patch 2016-05-24 22:02:10.000000000 +0200
@@ -0,0 +1,32 @@
+From: Jan Christoph Nordholz <jnordh...@sec.t-labs.tu-berlin.de>
+Subject: Ignore errors when enumerating interfaces
+
+When _intf_get_noalias() or _intf_get_aliases() fail, that usually means
+that addr_ston() failed to grab the address for a certain family. As new
+address families pop up all the time it seems ridiculous that failing to
+parse a single address type should render the whole interface scan empty.
+Instead the interface should just be skipped and the other interfaces
+reported properly.
+---
+ libdnet-stripped/src/intf.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/libdnet-stripped/src/intf.c b/libdnet-stripped/src/intf.c
+index b71fb82..6266a9f 100644
+--- a/libdnet-stripped/src/intf.c
++++ b/libdnet-stripped/src/intf.c
+@@ -928,12 +928,10 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg)
+ entry->intf_len = sizeof(ebuf);
+
+ if (_intf_get_noalias(intf, entry) < 0) {
+- ret = -1;
+- break;
++ continue;
+ }
+ if (_intf_get_aliases(intf, entry) < 0) {
+- ret = -1;
+- break;
++ continue;
+ }
+ if ((ret = (*callback)(entry, arg)) != 0)
+ break;
diff -Nru nmap-6.47/debian/patches/series nmap-6.47/debian/patches/series
--- nmap-6.47/debian/patches/series 2014-10-11 16:41:11.000000000 +0200
+++ nmap-6.47/debian/patches/series 2016-05-24 22:02:10.000000000 +0200
@@ -1,3 +1,5 @@
0001-use-su-to-root.patch
0002-Use-Debian-s-ca-certificates.patch
0003-Updated-German-translation-of-zenmap.patch
+0004-Fail-early-when-unable-to-properly-resolve-proxy-nam.patch
+0005-Ignore-errors-when-enumerating-interfaces.patch
diff -Nru nmap-6.47/debian/rules nmap-6.47/debian/rules
--- nmap-6.47/debian/rules 2014-09-21 17:00:03.000000000 +0200
+++ nmap-6.47/debian/rules 2016-05-24 21:06:33.000000000 +0200
@@ -17,3 +17,4 @@
override_dh_install:
dh_install --fail-missing -Xuninstall_zenmap -Xca-bundle.crt
+ rm -f debian/zenmap/usr/lib/python2.7/*/ndiff.py
