| @@ -81,7 +81,7 @@
extern void* ntop_safemalloc(unsigned int sz, char* file, int line);
#define calloc(c,sz) ntop_safecalloc(c, sz, (char*)__FILE__, (int)__LINE__)
--- Makefile.am.orig 2010-10-24 12:01:01.000000000 +0200
-+++ Makefile.am 2011-01-13 22:17:14.468981475 +0100
++++ Makefile.am 2011-01-13 22:29:28.917447868 +0100
@@ -133,8 +133,7 @@
ntop.c pbuf.c database.c \
plugin.c prefs.c protocols.c \
@@ -92,7 +92,7 @@
libntop_la_DEPENDENCIES = config.h
libntop_la_LIBADD = $(BASE_LIBS)
-@@ -372,22 +371,22 @@
+@@ -372,22 +371,6 @@
dnvt:
@echo ""
@echo ""
@@ -112,29 +112,14 @@
- @echo ""
- @echo -n "Old file lines were: "
- @gunzip -c oui.txt.gz.old | wc -l
-+ #@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 ""
-@@ -406,25 +405,25 @@
+@@ -405,27 +388,6 @@
+ @echo ""
@echo "Preparing "
@echo ""
-
+-
- @if test -f $(ETTER_PASSIVE).old; then \
- echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
- rm -rf $(ETTER_PASSIVE).old; \
@@ -154,25 +139,7 @@
- @echo "...Downloading new file..."
- @wget -O $(ETTER_PASSIVE_FILE) \
- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
-+ #@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 ""
@echo "gziping downloaded file..."
@gzip $(ETTER_PASSIVE_FILE)
+ @echo ""
|
