* [gentoo-commits] gentoo-x86 commit in net-analyzer/ntop/files: ntop-3.3.9-external-geoip.patch ntop-update-geoip-db
@ 2009-02-18 21:44 Alin Nastac (mrness)
0 siblings, 0 replies; only message in thread
From: Alin Nastac (mrness) @ 2009-02-18 21:44 UTC (permalink / raw
To: gentoo-commits
mrness 09/02/18 21:44:38
Modified: ntop-3.3.9-external-geoip.patch
Added: ntop-update-geoip-db
Log:
Update GeoIP databases through a cron job (#259394).
(Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64)
Revision Changes Path
1.2 net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch?r1=1.1&r2=1.2
Index: ntop-3.3.9-external-geoip.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.9-external-geoip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntop-3.3.9-external-geoip.patch 16 Feb 2009 22:17:29 -0000 1.1
+++ ntop-3.3.9-external-geoip.patch 18 Feb 2009 21:44:38 -0000 1.2
@@ -1,7 +1,7 @@
diff -Nru ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in
---- ntop-3.3.9.orig/configure.in 2009-02-16 19:43:57.000000000 +0000
-+++ ntop-3.3.9/configure.in 2009-02-16 19:47:10.000000000 +0000
-@@ -1882,20 +1882,6 @@
+--- ntop-3.3.9.orig/configure.in 2009-02-18 21:04:10.000000000 +0000
++++ ntop-3.3.9/configure.in 2009-02-18 21:05:58.000000000 +0000
+@@ -1883,39 +1883,7 @@
fi
dnl> GeoIP (http://www.maxmind.com/)
@@ -19,13 +19,21 @@
- fi
-fi
-
- if test -f "GeoLiteCity.dat"; then
- echo "GeoLiteCity.dat already present"
- else
-@@ -1911,10 +1897,7 @@
- fi
-
-
+-if test -f "GeoLiteCity.dat"; then
+- echo "GeoLiteCity.dat already present"
+-else
+- wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+- gunzip GeoLiteCity.dat.gz
+-fi
+-
+-if test -f "GeoIPASNum.dat"; then
+- echo "GeoIPASNum.dat already present"
+-else
+- wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+- gunzip GeoIPASNum.dat.gz
+-fi
+-
+-
-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
-GEO_IP="$GEO_DIR/libGeoIP/"
-CFLAGS="$CFLAGS -I$GEO_IP"
@@ -34,7 +42,7 @@
dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
-@@ -2079,7 +2062,6 @@
+@@ -2080,7 +2048,6 @@
AC_SUBST(SO_VERSION_PATCH)
AC_SUBST(RRD_LIB)
AC_SUBST(RRD_INC)
@@ -44,7 +52,7 @@
diff -Nru ntop-3.3.9.orig/initialize.c ntop-3.3.9/initialize.c
--- ntop-3.3.9.orig/initialize.c 2008-12-03 22:00:22.000000000 +0000
-+++ ntop-3.3.9/initialize.c 2009-02-16 22:04:34.000000000 +0000
++++ ntop-3.3.9/initialize.c 2009-02-18 21:04:44.000000000 +0000
@@ -467,16 +467,15 @@
#endif
@@ -85,8 +93,19 @@
diff -Nru ntop-3.3.9.orig/Makefile.am ntop-3.3.9/Makefile.am
--- ntop-3.3.9.orig/Makefile.am 2008-12-03 22:00:22.000000000 +0000
-+++ ntop-3.3.9/Makefile.am 2009-02-16 19:47:25.000000000 +0000
-@@ -270,8 +270,6 @@
++++ ntop-3.3.9/Makefile.am 2009-02-18 21:05:33.000000000 +0000
+@@ -76,9 +76,7 @@
+ NTOPDATA = ntop-cert.pem \
+ $(ETTER_PASSIVE) \
+ oui.txt.gz \
+- specialMAC.txt.gz \
+- GeoIPASNum.dat \
+- GeoLiteCity.dat
++ specialMAC.txt.gz
+
+ NTOPHTML = html html/*.js html/*.html html/*.gif html/*.jpg html/*.ico html/*.png \
+ html/*.css html/*.dtd \
+@@ -270,8 +268,6 @@
install: install-recursive
1.1 net-analyzer/ntop/files/ntop-update-geoip-db
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-update-geoip-db?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-update-geoip-db?rev=1.1&content-type=text/plain
Index: ntop-update-geoip-db
===================================================================
#!/bin/sh
BASE_URL=http://geolite.maxmind.com/download/geoip/database
echo "Updating NTOP GeoIP databases..."
cd /var/lib/ntop || exit
for u in asnum/GeoIPASNum.dat.gz GeoLiteCity.dat.gz ; do
FILE_GZ=${u#*/}
FILE=${FILE_GZ%.gz}
wget -O ${FILE_GZ} ${BASE_URL}/${u} &&
gunzip < ${FILE_GZ} > .${FILE} &&
mv -f .${FILE} ${FILE} &&
rm -f ${FILE_GZ} ||
exit
done
/etc/init.d/ntop --quiet status && /etc/init.d/ntop restart
echo "NTOP GeoIP databases were successfully updated"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-18 21:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-18 21:44 [gentoo-commits] gentoo-x86 commit in net-analyzer/ntop/files: ntop-3.3.9-external-geoip.patch ntop-update-geoip-db Alin Nastac (mrness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox