Added missing gunzip line for GeoIPASNum.dat file (bug#376453)

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index c2420e96ce3bf817a31a993398c2d4c4c2b9050e..37dfc8355a22d05912e895cee047ce7b91d15bdb 100644 (file)
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.101 2011/08/07 17:13:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.102 2011/08/10 07:05:34 polynomial-c Exp $
+
+  10 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/ntop-4.0.3-gentoo.patch:
+  non-maintainer commit: Added missing gunzip line for GeoIPASNum.dat file (bug
+  #376453). Fixed patch committed with kind permission from hwoarang.
 
   07 Aug 2011; Jeroen Roovers <jer@gentoo.org> -ntop-3.3.10-r2.ebuild,
   -files/ntop-3.3.10-CVE-2009-2732.patch, -files/ntop-3.3.10-gentoo.patch:

diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index 459071dd260ff549ba2804f174db204d0d4a660f..759a7e63b2c20ca33716c8a8667537a5403155df 100644 (file)
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX ntop-4.0.1-gentoo.patch 6996 RMD160 783a8d03343ddb2a2740d82bd720c62061dd7f4d SHA1 e2d2f57beb5a5ec5c077adbbccb9f9fe783f71ba SHA256 896d844bfcfb05030aa307152abcd9c177f058ee9f7db2fb3a01e15dbda43204
-AUX ntop-4.0.3-gentoo.patch 6977 RMD160 3aa832273f6ce89ff43a907585da9fdb04fdaca0 SHA1 da4ff0f51db4e4c6eaf69be01edfc4129da5d7fd SHA256 c6d88aaa411bf01f30450138370db6b33db0c3a1f694176e14d0ce460eee6d70
+AUX ntop-4.0.3-gentoo.patch 6228 RMD160 aad48f0b349ab6610d2a997e6840056269484c16 SHA1 c01796df5beada183f392f6cfe737e7c648d3147 SHA256 b341a031dfc4a01294d14ff8f52fae6cb591173d065a38db894ef031fa7207a5
 AUX ntop-confd 341 RMD160 40eb09215a1f50f86ae82ecd527198c2e7be17a3 SHA1 474aeb45826d71c28c5404add651f31be89b14d7 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d
 AUX ntop-initd 747 RMD160 cc62a0f68e7c27e63acaf55283784ab581a79ab9 SHA1 bf1ea42aeab524edcbe37cfc708919aed965f7d8 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d
 AUX ntop-update-geoip-db 492 RMD160 5999a24fb5868593d37746fc46f3536e727e7645 SHA1 c321c65338b764657f03c657487c66bf869f3f62 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6
@@ -10,12 +10,22 @@ DIST ntop-4.0.1.tar.gz 39184538 RMD160 f2c72578df5fff2e64278003a0754f67afe56e15
 DIST ntop-4.0.3.tgz 39191671 RMD160 a7b0f15409fee6b53b7c10d8b397fe0ade13120f SHA1 e7c31eabf31f61758e97d69398176520c1cb5613 SHA256 5b34b64fa4aebaeb365b2f255b2bbeb0a487686f49e85680789070d1c2404dc0
 EBUILD ntop-4.0.1.ebuild 3490 RMD160 c34bd4ef62cdbebf2185d3539df4d8d46d0f7b80 SHA1 b7ecb02559439505485d51594c3e2274e6540125 SHA256 a897183b453a8f1dcc18a3d20c1df60f2de55c5f2b792d2e0927e173d88cf0ce
 EBUILD ntop-4.0.3.ebuild 3498 RMD160 8f61b7b668eaa6a7fc27ea9fff5517e9a2fa15d5 SHA1 27a32aa787b26a85e9f3458f2bee6fbbb4340b0b SHA256 eff247f58484b049f0f077b3a7b130cbdaf7d10f5af8a37d40cf1f16c98a0e5a
-MISC ChangeLog 13919 RMD160 af2c8e70b62c3e1c50f44dd6d5532de0982de3c2 SHA1 9f5a0e655aafb1a8a201e9610cbc05df6731fd4d SHA256 7005a4c9cc0c28df2edf97406e90e6c086076292dfb68c45c65f439eb129e419
+MISC ChangeLog 14166 RMD160 331c668adf134dd3c7e50a662d0dc5d409e2215f SHA1 f9ca01d030095eebc765113250897731ba67f273 SHA256 16c01a396a742ec89d3d752d0def500c37f51e09c1dde8cb49edb51ae0fef5ba
 MISC metadata.xml 824 RMD160 a154081a070f768b186bfb77031dd77b1cf5aaea SHA1 bb97f483589129a9ed66374359cf367e266d1d5d SHA256 b256de7da036de4fe73823e20e25da4bac70c9f50f58a326dad39f6619f7a624
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4+x78ACgkQVWmRsqeSphNh7wCeIkiNjjDAsqIc8urcX0SFAtaw
-Sb0AniEVLmmkijl37Bug+2NPeYNrNfkJ
-=jHx7
+iQIcBAEBCgAGBQJOQi3DAAoJEPiazRVxLXTFZncP/09MnOTWnRGPTMYOIJg+0KvC
+BmuSkmklRN21vqUdaTLdCvBwBCcrwEjZ4IZlYwv0cxETx/LehXZdJJ4r8WrxN0fB
+XaPSRLH/jFoS5pztAkOlpl5l2y2/ANuI0fZ7v2VattKS2X6/bIae70w00gbQiaWQ
+wBEommzYI/pD6khqdB78+BL1+2JNkQDjOPctrrv8mZs03NCWtTzG23qwgcN29t8T
+x1jDp8iVZEumYX+O6GQSCV+joofmi3O1if7PLNfAVvW3W0Zgs6dcNiYK/i818wuD
+NeBj2WNgTPOgeOpvBtU0DS3WhJU1eZpexPwlfa6eFrUjNyw4nTVLGA0+XiUuuJzj
+gJO8FKhk52SLnxk3jZFvMUY8AutI9BIhFHUZvmzyoIldv4AUc4ktsfJ/LIhjD+Lg
+vIe97sXcnbkkkkakWcNVwgaXbZWQZCpTSrq4VP75JT6pp6e+HnWVPF2w8zBAF4Ky
+J5g3d5cDSJ8TTMgL3bWwtSoyoeeWIkU2mJS/iXKnqU88YjaOtqxXX7LA4TLqRmQB
+hSJExTdGHWZhmSDym1VzWEtc5azh3uG5+Sb/x33Jp7BYnwSpu5I+s3WqetVr9UV8
+iNxKIiVgIPSJiSMIUm7cYE/EtqryEU0KicSckCYN5XCdqKe7Evfe7Kagb3Hvu8Nq
+tTZfPMVPXjvKtVAd4/i4
+=1qri
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
index 8deb846a57a34945bfd44b9486cc4cb385460473..5de51c016c2b0e42abf731971080543c13392136 100644 (file)
--- a/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
@@ -1,110 +1,6 @@
-Index: ntop-4.0.3/Makefile.am
-===================================================================
---- ntop-4.0.3.orig/Makefile.am
-+++ ntop-4.0.3/Makefile.am
-@@ -43,7 +43,6 @@ CCLD      = @CCLD@
- 
- #AM_CFLAGS =
- #AM_LDFLAGS= 
--ACLOCAL_AMFLAGS=-I m4
- 
- DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
- CLEANFILES     = $(DISTCLEANFILES) stamp-h1
-@@ -74,9 +73,7 @@ ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD
- 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 \
-@@ -370,30 +367,7 @@ install-data-local: ntop.txt ntop.html f
- 
- # download the vendor information table
- dnvt:
--      @echo ""
--      @echo ""
--      @echo -n "Preparing "
--      @if test -f oui.txt; then \
--        rm -rf oui.txt; \
--      fi
--      @if test -f oui.txt.gz.old; then \
--        rm -rf oui.txt.gz.old; \
--      fi;
--      @mv oui.txt.gz oui.txt.gz.old
--      @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
--      @echo ""
--      @wget -c http://standards.ieee.org/regauth/oui/oui.txt
--      @gzip oui.txt
--      @echo ""
--      @echo ""
--      @echo -n "Old file lines were: "
--      @gunzip -c oui.txt.gz.old | wc -l
--      @echo -n "New file lines are:  "
--      @gunzip -c oui.txt.gz | wc -l
--      @echo ""
--      @echo ""
--      @echo "New file is:"
--      @ls -l oui.txt.gz
-+      @echo "Use included oui.txt.gz"
- 
- # download the Novell SAP Protocol information table
- #dnsapt:
-@@ -401,45 +375,7 @@ dnvt:
- 
- # download the passive ethernet fingerprint database
- dnetter:
--      @echo ""
--      @echo ""
--      @echo "Preparing "
--      @echo ""
--
--      @if test -f $(ETTER_PASSIVE).old; then \
--        echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
--        rm -rf $(ETTER_PASSIVE).old; \
--      fi;
--      @if test -f $(ETTER_PASSIVE); then \
--        echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
--        mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
--      fi;
--      @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
--              $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
--          if test -f $$file; then \
--           echo "...Deleting prior file, $$file..."; \
--             rm -rf $$file; \
--          fi; \
--        done
--      @echo ""
--      @echo "...Downloading new file..."
--      @wget -O $(ETTER_PASSIVE_FILE) \
--              $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
--      @echo ""
--      @echo "gziping downloaded file..."
--      @gzip $(ETTER_PASSIVE_FILE)
--      @echo ""
--      @echo ""
--      @if test -f $(ETTER_PASSIVE).old; then \
--        echo -n "Old file lines were: "; \
--        gunzip -c $(ETTER_PASSIVE).old | wc -l; \
--      fi;
--      @echo -n "New file lines are:  "
--      @gunzip -c $(ETTER_PASSIVE) | wc -l
--      @echo ""
--      @echo ""
--      @echo "New file is:"
--      @ls -l $(ETTER_PASSIVE)
-+      @echo "Use included $(ETTER_PASSIVE)"
- 
- # ntop census
- census-fail:
-Index: ntop-4.0.3/configure.in
-===================================================================
 --- ntop-4.0.3.orig/configure.in
 +++ ntop-4.0.3/configure.in
-@@ -57,6 +57,7 @@ dnl> generate the config header
+@@ -57,6 +57,7 @@
  dnl>
  umask 002
  AM_CONFIG_HEADER(config.h)
@@ -112,7 +8,7 @@ Index: ntop-4.0.3/configure.in
  
  HAS_ERROR=
  HAS_WARNING=
-@@ -511,11 +512,6 @@ if test ".${LOCALEDIR}" = "."; then
+@@ -511,11 +512,6 @@
      LOCALEDIR="/usr/lib/locale"
  fi
  
@@ -124,7 +20,7 @@ Index: ntop-4.0.3/configure.in
  PWD=`pwd`
  
  echo
-@@ -1824,18 +1820,6 @@ AC_CHECK_LIB([GeoIP], [GeoIP_name_by_ipn
+@@ -1824,18 +1820,6 @@
  if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
  LIBS="$LIBS -lGeoIP"
  
@@ -143,7 +39,7 @@ Index: ntop-4.0.3/configure.in
  dnl> --------
  
  if test -f "GeoIPASNum.dat"; then
-@@ -1854,8 +1838,12 @@ AC_MSG_RESULT(Please install GeoIP (http
+@@ -1854,8 +1838,13 @@
  exit 1
  fi
  
@@ -151,6 +47,7 @@ Index: ntop-4.0.3/configure.in
 -cp "3rd_party/specialMAC.txt.gz" .
 +
 +gunzip 3rd_party/GeoLiteCity.dat.gz &&
++gunzip 3rd_party/GeoIPASNum.dat.gz &&
 +mv "3rd_party/etter.finger.os.gz" . &&
 +mv "3rd_party/oui.txt.gz" . &&
 +mv "3rd_party/specialMAC.txt.gz" . ||
@@ -158,7 +55,7 @@ Index: ntop-4.0.3/configure.in
  
  if test -d ./configureextra; then
  
-@@ -2016,7 +2004,6 @@ AC_SUBST(SCRIPTVER)
+@@ -2016,7 +2005,6 @@
  AC_SUBST(SO_VERSION_PATCH)
  AC_SUBST(RRD_LIB)
  AC_SUBST(RRD_INC)
@@ -166,11 +63,9 @@ Index: ntop-4.0.3/configure.in
  AC_SUBST(GETOPT_H)
  AC_SUBST(GETOPT_C)
  
-Index: ntop-4.0.3/globals-core.c
-===================================================================
 --- ntop-4.0.3.orig/globals-core.c
 +++ ntop-4.0.3/globals-core.c
-@@ -372,7 +372,7 @@ void initNtopGlobals(int argc, char * ar
+@@ -372,7 +372,7 @@
    _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
    _headerSize[DLT_ATM_RFC1483] = 0;
  
@@ -179,7 +74,7 @@ Index: ntop-4.0.3/globals-core.c
    _headerSize[DLT_RAW] = 0;
  
    /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
-@@ -491,19 +491,18 @@ static void loadGeoIP(void) {
+@@ -491,19 +491,18 @@
    struct stat statbuf;
  
    /* Initialize GeoIP databases */
@@ -201,7 +96,7 @@ Index: ntop-4.0.3/globals-core.c
        }
      }
    }
-@@ -512,20 +511,18 @@ static void loadGeoIP(void) {
+@@ -512,20 +511,18 @@
      traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
    
    /* *************************** */
@@ -224,11 +119,109 @@ Index: ntop-4.0.3/globals-core.c
        }
      }
    }
-Index: ntop-4.0.3/report.c
-===================================================================
+--- ntop-4.0.3.orig/Makefile.am
++++ ntop-4.0.3/Makefile.am
+@@ -43,7 +43,6 @@
+ 
+ #AM_CFLAGS =
+ #AM_LDFLAGS= 
+-ACLOCAL_AMFLAGS=-I m4
+ 
+ DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
+ CLEANFILES     = $(DISTCLEANFILES) stamp-h1
+@@ -74,9 +73,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 \
+@@ -370,30 +367,7 @@
+ 
+ # download the vendor information table
+ dnvt:
+-      @echo ""
+-      @echo ""
+-      @echo -n "Preparing "
+-      @if test -f oui.txt; then \
+-        rm -rf oui.txt; \
+-      fi
+-      @if test -f oui.txt.gz.old; then \
+-        rm -rf oui.txt.gz.old; \
+-      fi;
+-      @mv oui.txt.gz oui.txt.gz.old
+-      @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
+-      @echo ""
+-      @wget -c http://standards.ieee.org/regauth/oui/oui.txt
+-      @gzip oui.txt
+-      @echo ""
+-      @echo ""
+-      @echo -n "Old file lines were: "
+-      @gunzip -c oui.txt.gz.old | wc -l
+-      @echo -n "New file lines are:  "
+-      @gunzip -c oui.txt.gz | wc -l
+-      @echo ""
+-      @echo ""
+-      @echo "New file is:"
+-      @ls -l oui.txt.gz
++      @echo "Use included oui.txt.gz"
+ 
+ # download the Novell SAP Protocol information table
+ #dnsapt:
+@@ -401,45 +375,7 @@
+ 
+ # download the passive ethernet fingerprint database
+ dnetter:
+-      @echo ""
+-      @echo ""
+-      @echo "Preparing "
+-      @echo ""
+-
+-      @if test -f $(ETTER_PASSIVE).old; then \
+-        echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
+-        rm -rf $(ETTER_PASSIVE).old; \
+-      fi;
+-      @if test -f $(ETTER_PASSIVE); then \
+-        echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
+-        mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
+-      fi;
+-      @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
+-              $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
+-          if test -f $$file; then \
+-           echo "...Deleting prior file, $$file..."; \
+-             rm -rf $$file; \
+-          fi; \
+-        done
+-      @echo ""
+-      @echo "...Downloading new file..."
+-      @wget -O $(ETTER_PASSIVE_FILE) \
+-              $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
+-      @echo ""
+-      @echo "gziping downloaded file..."
+-      @gzip $(ETTER_PASSIVE_FILE)
+-      @echo ""
+-      @echo ""
+-      @if test -f $(ETTER_PASSIVE).old; then \
+-        echo -n "Old file lines were: "; \
+-        gunzip -c $(ETTER_PASSIVE).old | wc -l; \
+-      fi;
+-      @echo -n "New file lines are:  "
+-      @gunzip -c $(ETTER_PASSIVE) | wc -l
+-      @echo ""
+-      @echo ""
+-      @echo "New file is:"
+-      @ls -l $(ETTER_PASSIVE)
++      @echo "Use included $(ETTER_PASSIVE)"
+ 
+ # ntop census
+ census-fail:
 --- ntop-4.0.3.orig/report.c
 +++ ntop-4.0.3/report.c
-@@ -2353,7 +2353,7 @@ void makeDot() {
+@@ -2353,7 +2353,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);
    } else {