From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LZuDg-0004Dn-Pe for garchives@archives.gentoo.org; Wed, 18 Feb 2009 21:44:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAB5EE02D5; Wed, 18 Feb 2009 21:44:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AC77EE02D5 for ; Wed, 18 Feb 2009 21:44:39 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 00590B5BB2 for ; Wed, 18 Feb 2009 21:44:39 +0000 (UTC) Received: from mrness by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LZuDe-0000b0-IE for gentoo-commits@lists.gentoo.org; Wed, 18 Feb 2009 21:44:38 +0000 From: "Alin Nastac (mrness)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mrness@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/ntop/files: ntop-3.3.9-external-geoip.patch ntop-update-geoip-db X-VCS-Repository: gentoo-x86 X-VCS-Files: ntop-3.3.9-external-geoip.patch ntop-update-geoip-db X-VCS-Directories: net-analyzer/ntop/files X-VCS-Committer: mrness X-VCS-Committer-Name: Alin Nastac Content-Type: text/plain; charset=utf8 Message-Id: Sender: Alin Nastac Date: Wed, 18 Feb 2009 21:44:38 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f830c746-3f16-41d2-b1f9-ddbb5e354a5b X-Archives-Hash: c677f8c0800efc236aba40d9f7e80e86 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.pa= tch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/= files/ntop-3.3.9-external-geoip.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/= files/ntop-3.3.9-external-geoip.patch?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/= files/ntop-3.3.9-external-geoip.patch?r1=3D1.1&r2=3D1.2 Index: ntop-3.3.9-external-geoip.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.9-exte= rnal-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 =20 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 -=20 -=20 +-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=3D`find $PWD -type d -name "GeoIP-*"` -GEO_IP=3D"$GEO_DIR/libGeoIP/" -CFLAGS=3D"$CFLAGS -I$GEO_IP" @@ -34,7 +42,7 @@ =20 dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) =20 -@@ -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 @@ =20 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 =20 @@ -85,8 +93,19 @@ =20 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 =3D ntop-cert.pem \ + $(ETTER_PASSIVE) \ + oui.txt.gz \ +- specialMAC.txt.gz \ +- GeoIPASNum.dat \ +- GeoLiteCity.dat ++ specialMAC.txt.gz +=20 + NTOPHTML =3D html html/*.js html/*.html html/*.gif html/*.jpg html/*.i= co html/*.png \ + html/*.css html/*.dtd \ +@@ -270,8 +268,6 @@ =20 install: install-recursive =20 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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/= files/ntop-update-geoip-db?rev=3D1.1&content-type=3Dtext/plain Index: ntop-update-geoip-db =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D #!/bin/sh BASE_URL=3Dhttp://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=3D${u#*/} FILE=3D${FILE_GZ%.gz} wget -O ${FILE_GZ} ${BASE_URL}/${u} && gunzip < ${FILE_GZ} > .${FILE} && mv -f .${FILE} ${FILE} &&=20 rm -f ${FILE_GZ} || exit=20 done /etc/init.d/ntop --quiet status && /etc/init.d/ntop restart echo "NTOP GeoIP databases were successfully updated"