[csw-devel] SF.net SVN: gar:[20627] csw/mgar/pkg/nmap/trunk

[chninkel at users.sourceforge.net]

Revision: 20627
          http://gar.svn.sourceforge.net/gar/?rev=20627&view=rev
Author:   chninkel
Date:     2013-04-07 07:59:32 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
nmap/trunk: fixed compilation bug, disabled lua support, update dependencies names

Modified Paths:
--------------
    csw/mgar/pkg/nmap/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmap/trunk/Makefile	2013-04-06 23:35:47 UTC (rev 20626)
+++ csw/mgar/pkg/nmap/trunk/Makefile	2013-04-07 07:59:32 UTC (rev 20627)
@@ -24,13 +24,16 @@
 
 PACKAGES += CSWnmap
 SPKG_DESC_CSWnmap = A network exploration tool and security/port scanner
-RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1
-RUNTIME_DEP_PKGS_CSWnmap += CSWlua
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibgcc-s1
+#RUNTIME_DEP_PKGS_CSWnmap += CSWlua
 RUNTIME_DEP_PKGS_CSWnmap += CSWpython
+
 # For Zenmap
-RUNTIME_DEP_PKGS_CSWnmap += CSWpygtk
+#RUNTIME_DEP_PKGS_CSWnmap += CSWpygtk
 
 # Tons of docs and identification of programs installed there
 CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content
@@ -47,6 +50,8 @@
 PKGFILES_CSWzenmap += $(sharedstatedir)/zenmap/.*
 
 
+PATCHFILES = 0001-Fix-IFF_IPMP-compilation-bug.patch
+
 # See standards(5) for details
 # we disable this (for) now, because we're switching the compiler to GCC4
 #EXTRA_CPPFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
@@ -64,7 +69,8 @@
 #   http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
 CONFIGURE_ARGS += --with-libdnet=included
 
-CONFIGURE_ARGS += --with-liblua=$(prefix)
+#CONFIGURE_ARGS += --with-liblua=$(prefix)
+CONFIGURE_ARGS += --without-liblua
 
 # Not necessary
 # CONFIGURE_ARGS += --with-libnbase=

Added: csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch	2013-04-07 07:59:32 UTC (rev 20627)
@@ -0,0 +1,28 @@
+From 2c44837792045bd96917bbd6f8a664afc655c270 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 6 Apr 2013 22:09:45 +0200
+Subject: [PATCH] Fix IFF_IPMP compilation bug
+
+---
+ libdnet-stripped/src/intf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libdnet-stripped/src/intf.c b/libdnet-stripped/src/intf.c
+index 25ae999..865e500 100644
+--- a/libdnet-stripped/src/intf.c
++++ b/libdnet-stripped/src/intf.c
+@@ -954,9 +954,11 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg)
+ 			;
+ 		else
+ 			return (-1);
++#ifdef IFF_IPMP
+ 		if (lifr->lifr_flags & IFF_IPMP) {
+ 			continue;
+ 		}
++#endif
+ 		
+ 		if (_intf_get_noalias(intf, entry) < 0)
+ 			return (-1);
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.