osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use GeoIP 1.4.8 which includes a DLL instead of a static library. 

svn path=/trunk/; revision=42905
This commit is contained in:
Gerald Combs 2012-05-29 23:31:00 +00:00
parent 86dd3248f6
commit 43670460ff
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.nmake
View File

@ -900,7 +900,7 @@ process_libs:
!ENDIF !ENDIF
!IFDEF GEOIP_DIR !IFDEF GEOIP_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_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 !ENDIF
!IFDEF HHC_DIR !IFDEF HHC_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_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 AirPcap_Devpack_4_1_0_1622
rm -r -f GeoIP-1.4.5ws rm -r -f GeoIP-1.4.5ws
rm -r -f GeoIP-1.4.6-win??ws rm -r -f GeoIP-1.4.6-win??ws
rm -r -f GeoIP-1.4.8-win??ws
rm -r -f WpdPack rm -r -f WpdPack
cd "$(MAKEDIR)" 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\mibs\tubs\*" $(INSTALL_DIR)\snmp\mibs /d
xcopy "$(SMI_DIR)\share\pibs\*" $(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 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 !ENDIF
cd $(INSTALL_DIR) cd $(INSTALL_DIR)
peflags --dynamicbase=true --nxcompat=true *.dll peflags --dynamicbase=true --nxcompat=true *.dll

12
config.nmake
View File

@ -406,7 +406,7 @@ SMI_PKG=svn-40773
# #
# Used to map IP addresses to MaxMind GeoIP database entries # 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 !else
##### Win64 Libraries ##### ##### Win64 Libraries #####
@ -615,7 +615,7 @@ SMI_PKG=svn-40773
# #
# Used to map IP addresses to MaxMind GeoIP database entries # 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 !endif
@ -1322,12 +1322,14 @@ SMI_CFLAGS=
SMI_CONFIG= SMI_CONFIG=
!ENDIF !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_CONFIG=^#define HAVE_GEOIP 1
GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1 GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1
GEOIP_CFLAGS=/I$(GEOIP_DIR) GEOIP_CFLAGS=/I$(GEOIP_DIR)/include
GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib GEOIP_LIBS=$(GEOIP_DIR)\lib\libGeoIP-1.lib
!ELSE !ELSE
GEOIP_DIR=
GEOIP_LIBS= GEOIP_LIBS=
GEOIP_CFLAGS= GEOIP_CFLAGS=
GEOIP_CONFIG= GEOIP_CONFIG=

3
packaging/nsis/Makefile.nmake
View File

@ -185,6 +185,9 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
!IFDEF SMI_DIR !IFDEF SMI_DIR
/DSMI_DIR=$(SMI_DIR) \ /DSMI_DIR=$(SMI_DIR) \
!ENDIF !ENDIF
!IFDEF GEOIP_DIR
/DGEOIP_DIR=$(GEOIP_DIR) \
!ENDIF
!IFDEF HHC_DIR !IFDEF HHC_DIR
/DHHC_DIR="$(HHC_DIR)" \ /DHHC_DIR="$(HHC_DIR)" \
!ENDIF !ENDIF

3
packaging/nsis/wireshark.nsi
View File

@ -410,6 +410,9 @@ File "..\..\epan\wslua\dtd_gen.lua"
!ifdef SMI_DIR !ifdef SMI_DIR
File "..\..\wireshark-gtk2\libsmi-2.dll" File "..\..\wireshark-gtk2\libsmi-2.dll"
!endif !endif
!ifdef GEOIP_DIR
File "..\..\wireshark-gtk2\libGeoIP-1.dll"
!endif
File "..\..\wireshark-gtk2\COPYING.txt" File "..\..\wireshark-gtk2\COPYING.txt"
File "..\..\wireshark-gtk2\NEWS.txt" File "..\..\wireshark-gtk2\NEWS.txt"
File "..\..\wireshark-gtk2\README.txt" File "..\..\wireshark-gtk2\README.txt"

2
tools/win32-setup.sh
View File

@ -4,7 +4,7 @@
# 32-bit wrapper for win-setup.sh. # 32-bit wrapper for win-setup.sh.
export DOWNLOAD_TAG="2012-05-14" export DOWNLOAD_TAG="2012-05-29"
export WIRESHARK_TARGET_PLATFORM="win32" export WIRESHARK_TARGET_PLATFORM="win32"
WIN_SETUP=`echo $0 | sed -e s/win32/win/` WIN_SETUP=`echo $0 | sed -e s/win32/win/`

2
tools/win64-setup.sh
View File

@ -4,7 +4,7 @@
# 64-bit wrapper for win-setup.sh. # 64-bit wrapper for win-setup.sh.
export DOWNLOAD_TAG="2012-05-14" export DOWNLOAD_TAG="2012-05-29"
export WIRESHARK_TARGET_PLATFORM="win64" export WIRESHARK_TARGET_PLATFORM="win64"
WIN_SETUP=`echo $0 | sed -e s/win64/win/` WIN_SETUP=`echo $0 | sed -e s/win64/win/`