diff options
| author | rodent <rodent@pkgsrc.org> | 2014-06-07 23:12:16 +0000 |
|---|---|---|
| committer | rodent <rodent@pkgsrc.org> | 2014-06-07 23:12:16 +0000 |
| commit | 8690d6322c3d60d70e6bb17b6400a0afcc42448f (patch) | |
| tree | 83c3bc50be907d6e3521b9388d75391554989e9e /net/nmap | |
| parent | 3f3dc9620682f948736d356d251fdb87e3bd45b3 (diff) | |
| download | pkgsrc-8690d6322c3d60d70e6bb17b6400a0afcc42448f.tar.gz | |
Fix build on OpenBSD. Defuzz patches. Problem reported to nmap-dev.
Diffstat (limited to 'net/nmap')
| -rw-r--r-- | net/nmap/distinfo | 7 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ab | 6 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ac | 4 | ||||
| -rw-r--r-- | net/nmap/patches/patch-libnetutil_netutil.cc | 14 |
4 files changed, 23 insertions, 8 deletions
diff --git a/net/nmap/distinfo b/net/nmap/distinfo index d1c42eac3fa..850bf319c8d 100644 --- a/net/nmap/distinfo +++ b/net/nmap/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.61 2013/09/24 21:29:20 drochner Exp $ +$NetBSD: distinfo,v 1.62 2014/06/07 23:12:16 rodent Exp $ SHA1 (nmap-6.40.tar.bz2) = ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb RMD160 (nmap-6.40.tar.bz2) = 6da4bd1a71386e52d4c76d3c3c1773c989e72c55 Size (nmap-6.40.tar.bz2) = 7871636 bytes -SHA1 (patch-ab) = ab3df07bc7a57fa6736f743c480e0c9497b43053 -SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad +SHA1 (patch-ab) = 442683349642a665e7d0a90bc581b971919ead8b +SHA1 (patch-ac) = a5904d0f6c47198c5022b75b612f01e5708db593 SHA1 (patch-ad) = 278be81387bc47566ee498a4f6ef4e2d4c1d522f +SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0 diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab index d953098040a..6bcefea18f1 100644 --- a/net/nmap/patches/patch-ab +++ b/net/nmap/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.19 2013/05/20 06:21:22 adam Exp $ +$NetBSD: patch-ab,v 1.20 2014/06/07 23:12:16 rodent Exp $ ---- configure.orig 2012-11-16 00:54:16.000000000 +0000 +--- configure.orig 2013-05-13 04:21:11.000000000 +0000 +++ configure -@@ -6311,6 +6311,7 @@ else +@@ -6322,6 +6322,7 @@ else extern char pcap_version[]; int main() { int major, minor1, minor2; diff --git a/net/nmap/patches/patch-ac b/net/nmap/patches/patch-ac index 094b7adaa79..8fc6b021248 100644 --- a/net/nmap/patches/patch-ac +++ b/net/nmap/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.7 2009/07/20 19:40:08 adrianp Exp $ +$NetBSD: patch-ac,v 1.8 2014/06/07 23:12:16 rodent Exp $ ---- ndiff/setup.py.orig 2009-06-24 22:35:54.000000000 +0100 +--- ndiff/setup.py.orig 2009-04-20 19:15:00.000000000 +0000 +++ ndiff/setup.py @@ -29,5 +29,5 @@ class checked_install(distutils.command. + "Installing your distribution's python-dev package may solve this problem.") diff --git a/net/nmap/patches/patch-libnetutil_netutil.cc b/net/nmap/patches/patch-libnetutil_netutil.cc new file mode 100644 index 00000000000..a6077158bac --- /dev/null +++ b/net/nmap/patches/patch-libnetutil_netutil.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-libnetutil_netutil.cc,v 1.1 2014/06/07 23:12:16 rodent Exp $ + +OpenBSD's socket.h doesn't include <sys/uio.h>. + +--- libnetutil/netutil.cc.orig 2013-07-28 22:08:48.000000000 +0000 ++++ libnetutil/netutil.cc +@@ -147,6 +147,7 @@ + #if HAVE_SYS_SOCKIO_H + #include <sys/sockio.h> /* SIOCGIFCONF for Solaris */ + #endif ++#include <sys/uio.h> + + /* Define CMSG_* symbols for Solaris 9 and earlier. See + http://wiki.opencsw.org/porting-faq#toc10. */ |