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

(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

2 files changed, 116 insertions, 118 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index c2420e96ce3b..37dfc8355a22 100644
--- 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/files/ntop-4.0.3-gentoo.patch b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
index 8deb846a57a3..5de51c016c2b 100644
--- 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 {