[Lunar-commits] <moonbase-other> nmap: fix linking bug

[v4hn]

commit fd21cb78657b9acfd855f609bc1c99c160b219c6
Author: v4hn <me at v4hn.de>
Date: Sat, 03 Aug 2013 07:55:52 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/fd21cb78657b9acfd855f609bc1c99c160b219c6

nmap: fix linking bug
---
  security/nmap/BUILD     | +4/-15    
  security/nmap/DETAILS   | +3/-0     
  security/nmap/PRE_BUILD | +10/-0    
  3 files changed, 17 insertions(+), 15 deletions(-)

--- a/security/nmap/BUILD
+++ b/security/nmap/BUILD
@@ -1,16 +1,5 @@
-(
+# use always nmaps own optimized library variants
+# this provides better reliability and performance
+OPTS+=" --with-libpcap=included --with-libdnet=included --with-libpcre=included" &&
 
-  patch_it $SOURCE2 0 &&
-  cd nping &&
-  patch_it $SOURCE2 0 &&
-  cd ../ncat &&
-  patch_it $SOURCE2 0 &&
-  cd $SOURCE_DIRECTORY &&
-
-  # use always nmaps own optimized library variants
-  # this provides better reliability and performance
-  OPTS+=" --with-libpcap=included --with-libdnet=included --with-libpcre=included" &&
-
-  default_build
-
-) > $C_FIFO 2>&1
+default_build
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -2,10 +2,13 @@
          VERSION=6.40
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=configure-libnl.diff
+         SOURCE3=nmap-6.40-fix-lib-order.patch
       SOURCE_URL=http://nmap.org/dist
      SOURCE2_URL=http://seclists.org/nmap-dev/2010/q2/att-606
+     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb
      SOURCE2_VFY=sha1:6a50b713b407acab5b1bb5925a9db951bf14ebc7
+     SOURCE3_VFY=sha1:34ed7154f444f71e35dec352c04ac62aff2d5941
         WEB_SITE=http://nmap.org
          ENTERED=20010922
          UPDATED=20130729
--- /dev/null
+++ b/security/nmap/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+
+patch_it $SOURCE2 0 &&
+cd nping &&
+patch_it $SOURCE2 0 &&
+cd ../ncat &&
+patch_it $SOURCE2 0 &&
+cd ..
+
+patch_it $SOURCE3 1