Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Haley (d2322415b31cb79950a9cb5b9bfb2ac232b35bb6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by David Haley (d2322415b31cb79950a9cb5b9bfb2ac232b35bb6)

Chronological Thread  
    < Chronological >       < Thread >
  • From: David Haley <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Haley (d2322415b31cb79950a9cb5b9bfb2ac232b35bb6)
  • Date: Thu, 29 Aug 2013 11:35:38 -0500
GIT changes to master grimoire by David Haley <khoralin AT gmail.com>:

dev/null |binary
net/ntop/BUILD | 4 ----
net/ntop/DEPENDS | 2 --
net/ntop/DETAILS | 10 ++--------
net/ntop/HISTORY | 8 ++++++++
net/ntop/PRE_BUILD | 22 +---------------------
net/ntop/systemgeoip.patch | 36 ------------------------------------
7 files changed, 11 insertions(+), 71 deletions(-)

New commits:
commit d2322415b31cb79950a9cb5b9bfb2ac232b35bb6
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Update: ntop 3.3.9 -> 5.0.1

Given the time passed since the last update it would stand to
reason to expect a few things to have changed. Do to the length
of time that has passed I wanted to take something of a
"green field" approach and try, to some extent, start fresh.

To that end regular version update changes in DETAILS
notwithstanding, I have removed references to GeoIP within
DETAILS and other files (BUILD, PRE_BUILD, systemgeoip.patch.
This included the removal of the systemgeoip.patch file that
was part of the older version of this spell.

SOURCE_GPG has been replaced with SOURCE_HASH.

BUILD has been removed. Using the default BUILD process produced
not anomolies that showed themselves during my testing and
compiling of this updated version.

Lastly, DEPENDS has been updated. During testing of the new version
it was found that two spells currently listed as required
dependancies (gd and rrdtool) no longer appear needed. The DEPENDS
file has been updated by removing these two files.

As a side note, it appears that the upstream developers have changed
the name of the product/software from "ntop" to "ntopng" and reset
version number. As an example, the latest version of ntop that could
be located is 5.0.1, which this update is made to facilitate.
With the emergance of "ntopng" the number appears to have started
over and is currently sitting at 1.0.

With this change, particularly with the regression of the version
number back to 1.0, would it be simplier to create a new spell for
"ntopng" and deprecate "ntop"?

diff --git a/net/ntop/BUILD b/net/ntop/BUILD
deleted file mode 100755
index bf828c0..0000000
--- a/net/ntop/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-OPTS="--localstatedir=${INSTALL_ROOT}/var/cache \
- $OPTS" &&
-make_single &&
-default_build
diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS
index 4aef58f..ffcaad8 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -2,14 +2,12 @@ depends autoconf &&
depends automake &&
depends gawk &&
depends geoip &&
-depends gd &&
depends gdbm &&
depends libtool &&
depends libpcap &&
depends libpng &&
depends m4 &&
depends perl &&
-depends rrdtool &&
depends zlib &&

optional_depends 'MYSQL' \
diff --git a/net/ntop/DETAILS b/net/ntop/DETAILS
index 102c26d..00e4994 100755
--- a/net/ntop/DETAILS
+++ b/net/ntop/DETAILS
@@ -1,15 +1,9 @@
SPELL=ntop
- VERSION=3.3.9
+ VERSION=5.0.1
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=GeoLiteCity.dat.gz
- SOURCE3=GeoIPASNum.dat.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=http://www.maxmind.com/download/geoip/database/$SOURCE2
-
SOURCE3_URL[0]=http://www.maxmind.com/download/geoip/database/asnum/$SOURCE3
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- SOURCE2_IGNORE=unversioned
- SOURCE3_IGNORE=unversioned
+
SOURCE_HASH=sha512:f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a
LICENSE[0]=GPL
WEB_SITE=http://www.ntop.org/
KEYWORDS="net"
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index a812852..4574cc4 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,11 @@
+2013-08-28 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: version bump 3.3.9 -> 5.0.1
+ * PRE_BUILD: removed geoip "stuff"
+ * BUILD: removed, default build used
+ * DEPENDS: gd & rrdtool not required
+ * ntop-3.3.9.tar.gz.sig: removed
+ * systemgeoip.patch: removed, doesn't seem needed
+
2010-10-30 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE_IGNORE for SOURCE2 and SOURCE3
* GeoLiteCity.dat.gz.sig, GeoIPASNum.dat.gz.sig: removed, no longer
needed
diff --git a/net/ntop/PRE_BUILD b/net/ntop/PRE_BUILD
index 624f34e..daa0795 100755
--- a/net/ntop/PRE_BUILD
+++ b/net/ntop/PRE_BUILD
@@ -1,24 +1,4 @@
default_pre_build &&
-verify_source "$SOURCE2" &&
-verify_source "$SOURCE3" &&
-cd $SOURCE_DIRECTORY &&
-
-#
-# Remove building of internal GeoIP
-#
-patch -p1 < $SPELL_DIRECTORY/systemgeoip.patch &&
-
-#
-# Unpack already downloaded GeoIP data
-#
-cp $SOURCE_CACHE/$SOURCE2 . &&
-cp $SOURCE_CACHE/$SOURCE3 . &&
-gunzip $SOURCE2 &&
-gunzip $SOURCE3 &&
-
-#
-# Fake GeoIP source as it's already installed
-#
-touch GeoIP.tar.gz &&

+cd $SOURCE_DIRECTORY &&
./autogen.sh --noconfig
diff --git a/net/ntop/ntop-3.3.9.tar.gz.sig b/net/ntop/ntop-3.3.9.tar.gz.sig
deleted file mode 100644
index 4f49999..0000000
Binary files a/net/ntop/ntop-3.3.9.tar.gz.sig and /dev/null differ
diff --git a/net/ntop/systemgeoip.patch b/net/ntop/systemgeoip.patch
deleted file mode 100644
index 5b1273b..0000000
--- a/net/ntop/systemgeoip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur ntop-3.3.9.orig/Makefile.am ntop-3.3.9/Makefile.am
---- ntop-3.3.9.orig/Makefile.am 2009-12-30 12:37:37.007745774 -0800
-+++ ntop-3.3.9/Makefile.am 2009-12-30 12:38:40.538426478 -0800
-@@ -270,8 +270,6 @@
-
- install: install-recursive
-
-- cd @GEO_DIR@; make install
--
- @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
-
- @echo ""
-diff -Naur ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in
---- ntop-3.3.9.orig/configure.in 2009-12-30 12:37:36.997426119 -0800
-+++ ntop-3.3.9/configure.in 2009-12-30 12:39:44.841488896 -0800
-@@ -1916,10 +1916,8 @@
- fi
-
-
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--GEO_IP="$GEO_DIR/libGeoIP/"
--CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
-+CFLAGS="$CFLAGS"
-+LDFLAGS="$LDFLAGS -lGeoIP"
-
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
-
-@@ -2084,7 +2082,6 @@
- AC_SUBST(SO_VERSION_PATCH)
- AC_SUBST(RRD_LIB)
- AC_SUBST(RRD_INC)
--AC_SUBST(GEO_DIR)
-
- AC_CONFIG_FILES([Makefile])
-


Archive powered by MHonArc 2.6.24.

Top of Page