From 43670460ff8c54a92c841653a758fd48c9e08a01 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 29 May 2012 23:31:00 +0000
Subject: [PATCH] Use GeoIP 1.4.8 which includes a DLL instead of a static
 library.

svn path=/trunk/; revision=42905
---
 Makefile.nmake                |  6 +++++-
 config.nmake                  | 12 +++++++-----
 packaging/nsis/Makefile.nmake |  3 +++
 packaging/nsis/wireshark.nsi  |  3 +++
 tools/win32-setup.sh          |  2 +-
 tools/win64-setup.sh          |  2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Makefile.nmake b/Makefile.nmake
index c5313977b4..c4cfa8393c 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -900,7 +900,7 @@ process_libs:
 !ENDIF
 !IFDEF GEOIP_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-		. GeoIP-1.4.6-$(WIRESHARK_TARGET_PLATFORM)ws.zip
+		GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF HHC_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
@@ -973,6 +973,7 @@ clean_setup:
     rm -r -f AirPcap_Devpack_4_1_0_1622
     rm -r -f GeoIP-1.4.5ws
     rm -r -f GeoIP-1.4.6-win??ws
+    rm -r -f GeoIP-1.4.8-win??ws
     rm -r -f WpdPack
     cd "$(MAKEDIR)"
 
@@ -1191,6 +1192,9 @@ install-all: install-generated-files
 	xcopy "$(SMI_DIR)\share\mibs\tubs\*" $(INSTALL_DIR)\snmp\mibs /d
 	xcopy "$(SMI_DIR)\share\pibs\*" $(INSTALL_DIR)\snmp\mibs /d
 	xcopy "$(SMI_DIR)\share\yang\*.yang" $(INSTALL_DIR)\snmp\mibs /d
+!ENDIF
+!IFDEF GEOIP_DIR
+	xcopy "$(GEOIP_DIR)\bin\libGeoip-1.dll" $(INSTALL_DIR) /d
 !ENDIF
 	cd $(INSTALL_DIR)
 	peflags --dynamicbase=true --nxcompat=true *.dll
diff --git a/config.nmake b/config.nmake
index 19a41b83fc..8a43ef3a49 100644
--- a/config.nmake
+++ b/config.nmake
@@ -406,7 +406,7 @@ SMI_PKG=svn-40773
 #
 # Used to map IP addresses to MaxMind GeoIP database entries
 #
-GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
+GEOIP_PKG=1.4.8
 
 !else
 ##### Win64 Libraries #####
@@ -615,7 +615,7 @@ SMI_PKG=svn-40773
 #
 # Used to map IP addresses to MaxMind GeoIP database entries
 #
-GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win64ws\libGeoIP
+GEOIP_PKG=1.4.8
 
 !endif
 
@@ -1322,12 +1322,14 @@ SMI_CFLAGS=
 SMI_CONFIG=
 !ENDIF
 
-!IFDEF GEOIP_DIR
+!IFDEF GEOIP_PKG
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 GEOIP_CONFIG=^#define HAVE_GEOIP 1
 GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1
-GEOIP_CFLAGS=/I$(GEOIP_DIR)
-GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib
+GEOIP_CFLAGS=/I$(GEOIP_DIR)/include
+GEOIP_LIBS=$(GEOIP_DIR)\lib\libGeoIP-1.lib
 !ELSE
+GEOIP_DIR=
 GEOIP_LIBS=
 GEOIP_CFLAGS=
 GEOIP_CONFIG=
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 2ccbab6bd6..6d3f2f8f0a 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -185,6 +185,9 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
 !IFDEF SMI_DIR
 	/DSMI_DIR=$(SMI_DIR) \
 !ENDIF
+!IFDEF GEOIP_DIR
+	/DGEOIP_DIR=$(GEOIP_DIR) \
+!ENDIF
 !IFDEF HHC_DIR
 	/DHHC_DIR="$(HHC_DIR)" \
 !ENDIF
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index b4cfd05205..90d99a600c 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -410,6 +410,9 @@ File "..\..\epan\wslua\dtd_gen.lua"
 !ifdef SMI_DIR
 File "..\..\wireshark-gtk2\libsmi-2.dll"
 !endif
+!ifdef GEOIP_DIR
+File "..\..\wireshark-gtk2\libGeoIP-1.dll"
+!endif
 File "..\..\wireshark-gtk2\COPYING.txt"
 File "..\..\wireshark-gtk2\NEWS.txt"
 File "..\..\wireshark-gtk2\README.txt"
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index fdb6a2cce8..6edc890f53 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -4,7 +4,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2012-05-14"
+export DOWNLOAD_TAG="2012-05-29"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`
diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh
index fb181484b3..34c6e32811 100755
--- a/tools/win64-setup.sh
+++ b/tools/win64-setup.sh
@@ -4,7 +4,7 @@
 
 # 64-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2012-05-14"
+export DOWNLOAD_TAG="2012-05-29"
 export WIRESHARK_TARGET_PLATFORM="win64"
 
 WIN_SETUP=`echo $0 | sed -e s/win64/win/`