Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [1517] trunk/package
|
From: <kr...@us...> - 2008-01-14 16:36:36
|
Revision: 1517
http://astlinux.svn.sourceforge.net/astlinux/?rev=1517&view=rev
Author: krisk84
Date: 2008-01-14 08:36:08 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
initial check-in of nprobe - still needs some work
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/nprobe/
trunk/package/nprobe/Config.in
trunk/package/nprobe/nprobe-disablemysql.patch
trunk/package/nprobe/nprobe-ipv6disable.patch
trunk/package/nprobe/nprobe-nospinlock.patch
trunk/package/nprobe/nprobe.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2008-01-13 05:39:11 UTC (rev 1516)
+++ trunk/package/Config.in 2008-01-14 16:36:08 UTC (rev 1517)
@@ -127,6 +127,7 @@
source "package/newt/Config.in"
source "package/nistnet/Config.in"
source "package/nocatsplash/Config.in"
+source "package/nprobe/Config.in"
source "package/ntp/Config.in"
source "package/openntpd/Config.in"
source "package/openser/Config.in"
Added: trunk/package/nprobe/Config.in
===================================================================
--- trunk/package/nprobe/Config.in (rev 0)
+++ trunk/package/nprobe/Config.in 2008-01-14 16:36:08 UTC (rev 1517)
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_NPROBE
+ bool "nprobe"
+ default n
+ help
+ Super-sweet netflow collector from the folks at ntop.org.
+ NProbe is distributed under the terms of the GPL but they
+ require a small donation to get access to the source. We
+ will NOT give it to you - DO NOT ASK. Pay for it - it's
+ worth it and you support open source.
+
+ http://www.ntop.org/nProbe.html
+
+config BR2_PACKAGE_NPROBE_SITE
+ string "nprobe-site"
+ default "http://www.something.com"
+ depends on BR2_PACKAGE_NPROBE
+ help
+ Where is the NProbe source code?
Added: trunk/package/nprobe/nprobe-disablemysql.patch
===================================================================
--- trunk/package/nprobe/nprobe-disablemysql.patch (rev 0)
+++ trunk/package/nprobe/nprobe-disablemysql.patch 2008-01-14 16:36:08 UTC (rev 1517)
@@ -0,0 +1,24 @@
+diff -ur nProbe.orig/configure.in nProbe/configure.in
+--- nProbe.orig/configure.in 2007-09-17 18:39:04.000000000 -0400
++++ nProbe/configure.in 2008-01-14 00:08:05.000000000 -0500
+@@ -170,20 +170,6 @@
+ dnl> checks for system header files
+ dnl>
+
+-AC_CHECK_TOOL(MYSQL, mysql_config)
+-if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+- MYSQLLIBS="`mysql_config --libs_r`|grep Usage"
+- if test ".$MYSQLLIBS" != "."; then
+- LIBS="${LIBS} `mysql_config --libs`"
+- else
+- LIBS="${LIBS} `mysql_config --libs_r`"
+- fi
+- INCS="${INCS} `mysql_config --cflags`"
+- AC_DEFINE_UNQUOTED(HAVE_MYSQL, 1, [use mysql])
+-dnl> LIBS="${LIBS} -lwrap"
+-else
+- echo "MySQL not found. Database support disabled";
+-fi
+
+
+ AC_CHECK_LIB([sqlite3], [sqlite3_open], AC_DEFINE_UNQUOTED(HAVE_SQLITE, 1, [use sqlite]))
Added: trunk/package/nprobe/nprobe-ipv6disable.patch
===================================================================
--- trunk/package/nprobe/nprobe-ipv6disable.patch (rev 0)
+++ trunk/package/nprobe/nprobe-ipv6disable.patch 2008-01-14 16:36:08 UTC (rev 1517)
@@ -0,0 +1,29 @@
+--- nProbe.orig/nprobe.c 2007-09-17 18:39:04.000000000 -0400
++++ nProbe/nprobe.c 2008-01-14 00:28:53.000000000 -0500
+@@ -313,8 +313,10 @@
+ u_short eth_type, off=0, numPkts = 1;
+ u_int8_t flags = 0, proto = 0;
+ struct ip ip;
++#ifndef IPV4_ONLY
+ struct ip6_hdr ipv6;
+ struct ip6_ext ipv6ext;
++#endif
+ struct tcphdr tp;
+ struct udphdr up;
+ struct icmp icmpPkt;
+@@ -455,6 +457,7 @@
+ isFragment = (ntohs(ip.ip_off) & 0x3fff) ? 1 : 0;
+
+ off = ntohs(ip.ip_off);
++#ifndef IPV4_ONLY
+ } else if(eth_type == ETHERTYPE_IPV6) {
+ memcpy(&ipv6, p+ehshift, sizeof(struct ip6_hdr));
+ if(((ipv6.ip6_vfc >> 4) & 0x0f) != 6) return; /* IP v6 only */
+@@ -487,6 +490,7 @@
+ proto = ipv6ext.ip6e_nxt;
+ }
+ } else
++#endif
+ return; /* Anything else that's not IPv4/v6 */
+
+ plen = length-ehshift;
Added: trunk/package/nprobe/nprobe-nospinlock.patch
===================================================================
--- trunk/package/nprobe/nprobe-nospinlock.patch (rev 0)
+++ trunk/package/nprobe/nprobe-nospinlock.patch 2008-01-14 16:36:08 UTC (rev 1517)
@@ -0,0 +1,24 @@
+diff -ur nProbe.orig/configure.in nProbe/configure.in
+--- nProbe.orig/configure.in 2007-09-17 18:39:04.000000000 -0400
++++ nProbe/configure.in 2008-01-14 00:03:46.000000000 -0500
+@@ -217,20 +217,6 @@
+ AC_CHECK_HEADERS(sched.h sys/sched.h semaphore.h pthread.h)
+ AC_CHECK_LIB(pthread, pthread_create)
+
+-AC_MSG_CHECKING([if spin locks are supported])
+-AC_TRY_RUN([
+-#include <pthread.h>
+-
+-int main()
+-{
+- pthread_spinlock_t t;
+- return 0;
+-}
+-
+-]
+-, [ AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_SPIN_LOCK, 1, [pthread has spin locks]) ], [AC_MSG_RESULT(no)]
+-)
+-dnl> AC_CHECK_LIB([pthread], [pthread_spin_init], AC_DEFINE_UNQUOTED(HAVE_SPIN_LOCK, 1, [pthread has spin locks]))
+ AC_CHECK_LIB(dl, dlopen)
+
+
Added: trunk/package/nprobe/nprobe.mk
===================================================================
--- trunk/package/nprobe/nprobe.mk (rev 0)
+++ trunk/package/nprobe/nprobe.mk 2008-01-14 16:36:08 UTC (rev 1517)
@@ -0,0 +1,65 @@
+#############################################################
+#
+# nprobe
+#
+#############################################################
+NPROBE_VER:=4.9.4
+NPROBE_DIR:=$(BUILD_DIR)/nProbe
+NPROBE_SITE:=$(BR2_PACKAGE_NPROBE_SITE)
+NPROBE_SOURCE:=nProbe-$(NPROBE_VER).tar.gz
+NPROBE_CAT:=zcat
+NPROBE_BINARY:=less
+NPROBE_TARGET_BINARY:=usr/sbin/nprobe
+
+$(DL_DIR)/$(NPROBE_SOURCE):
+ $(WGET) -P $(DL_DIR) $(NPROBE_SITE)/$(NPROBE_SOURCE)
+
+nprobe-source: $(DL_DIR)/$(NPROBE_SOURCE)
+
+$(NPROBE_DIR)/.unpacked: $(DL_DIR)/$(NPROBE_SOURCE)
+ $(NPROBE_CAT) $(DL_DIR)/$(NPROBE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(NPROBE_DIR) package/nprobe/ nprobe*.patch
+ touch $(NPROBE_DIR)/.unpacked
+
+$(NPROBE_DIR)/.configured: $(NPROBE_DIR)/.unpacked
+ ( \
+ cd $(NPROBE_DIR) ; \
+ BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./autogen.sh \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=$(STAGING_DIR)/usr \
+ --with-only-ipv4 \
+ )
+ touch $(NPROBE_DIR)/.configured
+
+$(NPROBE_DIR)/$(NPROBE_BINARY): $(NPROBE_DIR)/.configured
+ $(MAKE1) -C $(NPROBE_DIR)
+
+$(TARGET_DIR)/$(NPROBE_TARGET_BINARY): $(NPROBE_DIR)/$(NPROBE_BINARY)
+ $(MAKE) \
+ -C $(NPROBE_DIR) \
+ prefix=$(STAGING_DIR) \
+ exec_prefix=$(STAGING_DIR) \
+ bindir=$(STAGING_DIR)/bin \
+ datadir=$(STAGING_DIR)/share \
+ fudge
+
+nprobe: uclibc libpcap zlib $(TARGET_DIR)/$(NPROBE_TARGET_BINARY)
+
+nprobe-clean:
+ -$(MAKE) -C $(NPROBE_DIR) clean
+
+nprobe-dirclean:
+ rm -rf $(NPROBE_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_NPROBE)),y)
+TARGETS+=nprobe
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
