Bug#697323: release.debian.org: unblock: nmap/6.00-0.3

[Hilko Bengen <bengen@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock nmap which contains a backported upstream fix for #696446
which made the nmap program unusable in certain setups.

Thanks,
-Hilko

diff -u nmap-6.00/debian/changelog nmap-6.00/debian/changelog
--- nmap-6.00/debian/changelog
+++ nmap-6.00/debian/changelog
@@ -1,3 +1,10 @@
+nmap (6.00-0.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply upstream fix for interfaces in monitor mode (Closes: #696446).
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 29 Dec 2012 18:43:12 +0100
+
 nmap (6.00-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- nmap-6.00.orig/libdnet-stripped/src/addr.c
+++ nmap-6.00/libdnet-stripped/src/addr.c
@@ -318,6 +318,7 @@
 #endif
 	case AF_UNSPEC:
 	case ARP_HRD_ETH:	/* XXX- Linux arp(7) */
+	case ARP_HRD_IEEE80211_RADIOTAP: /* IEEE 802.11 + radiotap header */
 		a->addr_type = ADDR_TYPE_ETH;
 		a->addr_bits = ETH_ADDR_BITS;
 		memcpy(&a->addr_eth, sa->sa_data, ETH_ADDR_LEN);
only in patch2:
unchanged:
--- nmap-6.00.orig/libdnet-stripped/include/dnet/arp.h
+++ nmap-6.00/libdnet-stripped/include/dnet/arp.h
@@ -39,6 +39,8 @@
 #define ARP_HRD_ETH 	0x0001	/* ethernet hardware */
 #define ARP_HRD_IEEE802	0x0006	/* IEEE 802 hardware */
 
+#define ARP_HRD_IEEE80211_RADIOTAP 0x0323  /* IEEE 802.11 + radiotap header */
+
 /*
  * Protocol address format
  */