diff options
| author | pettai <pettai> | 2012-10-20 22:59:29 +0000 |
|---|---|---|
| committer | pettai <pettai> | 2012-10-20 22:59:29 +0000 |
| commit | 2102feb9c630669eec201f8785d537cfd97b373c (patch) | |
| tree | 46f6ac6c5606ea2cabcca7a7c9421340cae8bdfe /net | |
| parent | 52da48be3a9633c62022942e15044c92ea9738d2 (diff) | |
| download | pkgsrc-2102feb9c630669eec201f8785d537cfd97b373c.tar.gz | |
Added build fix for Solaris 10, as suggested by PR pkg/47033
Diffstat (limited to 'net')
| -rw-r--r-- | net/nmap/Makefile | 4 | ||||
| -rw-r--r-- | net/nmap/distinfo | 4 | ||||
| -rw-r--r-- | net/nmap/patches/patch-an | 17 |
3 files changed, 20 insertions, 5 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile index cfbc7ba2ca5..04dc47f9c48 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.95 2012/10/08 23:02:17 adam Exp $ +# $NetBSD: Makefile,v 1.96 2012/10/20 22:59:29 pettai Exp $ DISTNAME= nmap-6.01 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net security MASTER_SITES= http://nmap.org/dist/ EXTRACT_SUFX= .tar.bz2 diff --git a/net/nmap/distinfo b/net/nmap/distinfo index 64c329931e5..0163376c66a 100644 --- a/net/nmap/distinfo +++ b/net/nmap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.57 2012/09/17 06:15:50 dholland Exp $ +$NetBSD: distinfo,v 1.58 2012/10/20 22:59:30 pettai Exp $ SHA1 (nmap-6.01.tar.bz2) = e397e453893930d14e9bb33a847d15b94b7ee83a RMD160 (nmap-6.01.tar.bz2) = 1b6f2b0e4f019d9cd069db14990364c45d463c7d Size (nmap-6.01.tar.bz2) = 21640157 bytes SHA1 (patch-ab) = 89a1794a1bf954ddf42d94d88de444efa52e5cfb SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad -SHA1 (patch-an) = fd7f6206e2061b851cf65778704b6f9c2e171b00 +SHA1 (patch-an) = ddafce5f617c1c547912895f345c80a52c9e7656 diff --git a/net/nmap/patches/patch-an b/net/nmap/patches/patch-an index 868a22fe6de..91fe62723dd 100644 --- a/net/nmap/patches/patch-an +++ b/net/nmap/patches/patch-an @@ -1,8 +1,11 @@ -$NetBSD: patch-an,v 1.1 2012/09/16 20:29:06 pettai Exp $ +$NetBSD: patch-an,v 1.2 2012/10/20 22:59:30 pettai Exp $ Fix for sa_len size problem on NetBSD (See commit r29739 in nmap's svn for details) +Fix (build) for Solaris 10 +(See commit r29672 in nmap's svn or PR pkg/47033) + --- libdnet-stripped/src/intf.c.orig 2012-05-24 03:59:25.000000000 +0000 +++ libdnet-stripped/src/intf.c @@ -64,9 +64,10 @@ @@ -19,3 +22,15 @@ Fix for sa_len size problem on NetBSD #else # define NEXTIFR(i) (i + 1) #endif +@@ -954,9 +955,11 @@ intf_loop(intf_t *intf, intf_handler cal + ; + else + return (-1); ++#ifdef IFF_IPMP + if (lifr->lifr_flags & IFF_IPMP) { + continue; + } ++#endif + + if (_intf_get_noalias(intf, entry) < 0) + return (-1); |