SF.net SVN: gar:[22818] csw/mgar/pkg/ntop/trunk
jonbcraig at users.sourceforge.net
jonbcraig at users.sourceforge.net
Sat Jan 11 22:53:42 CET 2014
Revision: 22818
http://sourceforge.net/p/gar/code/22818
Author: jonbcraig
Date: 2014-01-11 21:53:38 +0000 (Sat, 11 Jan 2014)
Log Message:
-----------
Updated to support build of ntop v4.1.0
This is the last build before nDPI was introduced. This feature does not
currently support solaris / sparc processors due to a number of specific
linux includes and its inability to determine the endianess of the
system.
Modified Paths:
--------------
csw/mgar/pkg/ntop/trunk/Makefile
csw/mgar/pkg/ntop/trunk/checksums
csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch
Added Paths:
-----------
csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch
csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch
csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch
csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile 2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/Makefile 2014-01-11 21:53:38 UTC (rev 22818)
@@ -1,5 +1,5 @@
NAME = ntop
-VERSION = 4.0.3
+VERSION = 4.1.0
GARTYPE = v2
DESCRIPTION = A network traffic usage monitor
@@ -13,7 +13,7 @@
endef
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(NAME)-$(VERSION).tgz
+DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += cswntop
EXPANDVARS += cswntop
@@ -24,19 +24,15 @@
INITSMF = /etc/opt/csw/init.d/cswntop
-PATCHFILES = 0001-Fix-misplaced-endif.patch
-PATCHFILES += 0002-Do-not-redeclare-__builtin_alloca.patch
-PATCHFILES += 0003-Check-for-uint_-in-addition-to-u_int_.patch
-PATCHFILES += 0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
-PATCHFILES += 0005-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
-PATCHFILES += 0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch
-PATCHFILES += 0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
-# Added by bwalton to make auto* happy again; These should likely be
-# upstreamed.
PATCHFILES += 0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
-PATCHFILES += 0002-Modernize-a-few-macros-in-configure.in.patch
-PATCHFILES += 0003-Add-an-extra-automake-option-for-per-target-compiler.patch
+PATCHFILES += 0002-Do-not-redeclare-__builtin_alloca.patch
+PATCHFILES += 0003-Modernize-a-few-macros-in-configure.in.patch
+PATCHFILES += 0004-Add-an-extra-automake-option-for-per-target-compiler.patch
+PATCHFILES += 0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
+PATCHFILES += 0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
+PATCHFILES += 0007-Update-the-URL-for-etter.finger.os.patch
+PATCHFILES += 0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233
Modified: csw/mgar/pkg/ntop/trunk/checksums
===================================================================
--- csw/mgar/pkg/ntop/trunk/checksums 2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/checksums 2014-01-11 21:53:38 UTC (rev 22818)
@@ -1 +1 @@
-f064393a2090e5bda102cd49c2707789 ntop-4.0.3.tgz
+116df99cf548431393991ea15443c52f ntop-4.1.0.tar.gz
Modified: csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch 2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -1,21 +1,19 @@
-From 7208317da489838e604ca975bf9eb2fad1a2c49f Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 27 Apr 2013 16:13:13 +0200
-Subject: [PATCH 1/3] Update macros used in Makefile.am for modern convention
+From 2ff00646912b06c45ce45b9b525ae09c3500fcc0 Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:38:04 +0100
+Subject: [PATCH] Update macros used in Makefile.am for modern convention
INCLUDES is a deprecated name in Makefile.am. Use AM_CPPFLAGS instead.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
---
Makefile.am | 2 +-
plugins/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 5a6f022..646b8bd 100644
+index e4b0fc1..a8709f2 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -33,7 +33,7 @@ PROGRAM = $(PKGNAME)-$(VERSION)
+@@ -26,7 +26,7 @@ PROGRAM = $(PKGNAME)-$(VERSION)
DEFS = @DEFS@
INCS = @INCS@
@@ -38,5 +36,5 @@
#
# The meat for ntop
--
-1.8.1.4
+1.8.4.1
Modified: csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch 2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -1,24 +1,25 @@
-From b41a4c15c708ee01cf91a9d20dca3b6ae095370a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 11 Nov 2010 10:50:20 +0100
-Subject: [PATCH 2/4] Do not redeclare __builtin_alloca
+From 381e8a4c6a56a7142e896be2f67dfaab57b6566a Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:42:12 +0100
+Subject: [PATCH 3/3] Do not redeclare __builtin_alloca
---
- argv.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ argv.c | 2 --
+ 1 file changed, 2 deletions(-)
diff --git a/argv.c b/argv.c
-index 9212e85..84b02c6 100644
+index 7b75130..db0d7e5 100644
--- a/argv.c
+++ b/argv.c
-@@ -28,6 +28,7 @@ Cambridge, MA 02139, USA. */
+@@ -28,8 +28,6 @@ Cambridge, MA 02139, USA. */
#else /* not __GNUC__ */
#ifdef sparc
#include <alloca.h>
-+/* This is declared at least on Solaris 9, maybe this should better be detected during configure-time?
- extern char *__builtin_alloca(); /* Stupid include file doesn't declare it */
+-/* This is declared at least on Solaris 9, maybe this should better be detected during configure-time? */
+-extern char *__builtin_alloca(); /* Stupid include file doesn't declare it */
#else
#ifdef _AIX
+ #pragma alloca
--
-1.7.3
+1.8.4.1
Added: csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,46 @@
+From faa52dcdbb20e4882f1f6d093c0fbab1fd04dce1 Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:46:57 +0100
+Subject: [PATCH 5/5] Modernize a few macros in configure.in
+
+Use the recommended macro names for modern autoconf/automake.
+
+Also, don't call AC_PROG_CC early, call it when the script will
+indicate that it's checking for cc, etc.
+---
+ configure.in | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d7b7979..67a3869 100644
+--- a/configure.in
++++ b/configure.in
+@@ -56,7 +56,7 @@ dnl>
+ dnl> generate the config header
+ dnl>
+ umask 002
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ HAS_ERROR=
+ HAS_WARNING=
+@@ -151,7 +151,6 @@ dnl> NTOPCONFIGDEBUG_SETTINGS([ntop defaults])
+ # Checks for programs.
+
+ AC_PROG_CPP
+-AC_PROG_CC
+ dnl> AC_PROG_CXX no c++ code (yet?)
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -324,7 +323,7 @@ dnl>
+ echo
+ echo "Checking C compiler program and features..."
+ echo
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+ echo
+ echo "*******************************************************************"
+--
+1.8.4.1
+
Added: csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,29 @@
+From 1f889ae4c183fe172097d4461f3b0d8cb025bfa5 Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:48:57 +0100
+Subject: [PATCH 7/7] Add an extra automake option for per-target compiler
+ options
+
+This squashes an automake warning and allows the compiler to be
+reliably called with both -c and -o.
+---
+ configure.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 67a3869..2fcfa86 100644
+--- a/configure.in
++++ b/configure.in
+@@ -341,6 +341,9 @@ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+ HAS_WARNING="yes"
+ fi
+
++dnl> For per-target flags; must be called after AC_PROG_CC
++AM_PROG_CC_C_O
++
+ dnl> NTOPCONFIGDEBUG_SETTINGS([After cc stdc test])
+
+ dnl> Any common settings required to support a specific OS, distribution or release
+--
+1.8.4.1
+
Added: csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,35 @@
+From 234af0e2534c6edc955b7689425a094ced4fcfab Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:53:02 +0100
+Subject: [PATCH 9/9] Strip default Solaris library pathes as we set our own
+
+---
+ configureextra/SOLARIS10 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configureextra/SOLARIS10 b/configureextra/SOLARIS10
+index 5e12960..6f1a6ea 100644
+--- a/configureextra/SOLARIS10
++++ b/configureextra/SOLARIS10
+@@ -5,9 +5,9 @@
+ #
+
+ echo " Setting Solaris 10 specific flag values"
+-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
++#LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
+ LIBS="-lnsl -lsocket ${LIBS}"
+-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
++#CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
+
+ . configureextra/functions
+
+@@ -28,4 +28,4 @@ echo "- cd /usr/local/lib"
+ echo "- ln -s libpcap.so.0.X.Y libpcap.so"
+ echo "- rm libpcap.a"
+ echo ""
+-echo "*************************************************"
+\ No newline at end of file
++echo "*************************************************"
+--
+1.8.4.1
+
Added: csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,25 @@
+From 34570a310386716b6b0f41de8071d944cb10c34d Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:55:10 +0100
+Subject: [PATCH 11/11] Change default PID file location to /var/opt/csw/ntop
+
+---
+ globals-defines.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/globals-defines.h b/globals-defines.h
+index 4acb19f..e78dbc5 100644
+--- a/globals-defines.h
++++ b/globals-defines.h
+@@ -1874,7 +1874,7 @@
+ * default file and directories
+ */
+ #define DEFAULT_NTOP_PIDFILE "ntop.pid"
+-#define DEFAULT_NTOP_PID_DIRECTORY "/var/run"
++#define DEFAULT_NTOP_PID_DIRECTORY "/var/opt/csw/run"
+
+ /*
+ * default configuration parameters -- the comment gives the (short getopt) name
+--
+1.8.4.1
+
Added: csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,36 @@
+From 05f0b44e903151d06bc87c5b34dfaac6e57e9d04 Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 21:58:21 +0100
+Subject: [PATCH 13/13] Update the URL for etter.finger.os
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a8709f2..520446a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -61,8 +61,8 @@ SUBDIRS = . @PLUGINS@
+
+ ETTER_PASSIVE_FILE = etter.finger.os
+ ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
+-ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
+-ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD"
++#ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
++ETTER_PASSIVE_DOWNLOAD_FROM = "https://github.com/Ettercap/ettercap/blob/master/share"
+
+ NTOPDATA = ntop-cert.pem \
+ $(ETTER_PASSIVE) \
+@@ -416,7 +416,7 @@ dnetter:
+ @echo ""
+ @echo "...Downloading new file..."
+ @wget -O $(ETTER_PASSIVE_FILE) \
+- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
++ $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)
+ @echo ""
+ @echo "gziping downloaded file..."
+ @gzip $(ETTER_PASSIVE_FILE)
+--
+1.8.4.1
+
Added: csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch 2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,44 @@
+From 11f8b368573d570e49bdb071f3e092c7e4caded2 Mon Sep 17 00:00:00 2001
+From: Jon Craig <jcraig at opencsw.org>
+Date: Sat, 11 Jan 2014 22:03:23 +0100
+Subject: [PATCH 15/15] Update defaults from /usr/local to /opt/csw -
+ /etc/opt/csw
+
+---
+ globals-defines.h | 6 +++---
+ report.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/globals-defines.h b/globals-defines.h
+index e78dbc5..8ec0032 100644
+--- a/globals-defines.h
++++ b/globals-defines.h
+@@ -2696,9 +2696,9 @@ struct ip6_hdr
+
+ /* *************************** */
+
+-#define DEFAULT_NTOP_PLUGINS_INSTALL "/usr/local/lib/ntop/plugins"
+-#define DEFAULT_NTOP_HTML_INSTALL "/usr/local/share/ntop"
+-#define DEFAULT_NTOP_CFG_CONFIGFILE_DIR "/usr/local/etc/ntop"
++#define DEFAULT_NTOP_PLUGINS_INSTALL "/opt/csw/lib/ntop/plugins"
++#define DEFAULT_NTOP_HTML_INSTALL "/opt/csw/share/ntop"
++#define DEFAULT_NTOP_CFG_CONFIGFILE_DIR "/etc/opt/csw/ntop"
+
+ #define DOMAIN_VIEW 0
+ #define NETWORK_VIEW 1
+diff --git a/report.c b/report.c
+index a0cc174..0ea16b0 100644
+--- a/report.c
++++ b/report.c
+@@ -2091,7 +2091,7 @@ void makeDot() {
+ if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
+ snprintf(dotPath, sizeof(dotPath), "%s", buf);
+ } else {
+- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
++ snprintf(dotPath, sizeof(dotPath), "/opt/csw/bin/dot");
+ storePrefsValue("dot.path", dotPath); /* Set the default */
+ }
+
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list