osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable 

AirPcap.

svn path=/trunk/; revision=20321
This commit is contained in:
Gerald Combs 2007-01-05 01:35:23 +00:00
parent a69bfb6029
commit 7d0118ff10
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.nmake
View File

@ -548,7 +548,7 @@ setup: verify_tools
gettext-0.14.5 gettext-0.14.5.zip
!IFDEF NET_SNMP_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. net-snmp-5.3.1.zip
. net-snmp-5.4.zip
!ENDIF
!IFDEF KFW_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@ -558,6 +558,10 @@ setup: verify_tools
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. WpdPack_3_1.zip
!ENDIF
!IFDEF AIRPCAP_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. AirPcap_Devpack_1_0_0_594.zip
!ENDIF
!IFDEF ADNS_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. adns-1.0-win32-05.zip
@ -578,7 +582,7 @@ setup: verify_tools
!ENDIF
!IFDEF GNUTLS_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. gnutls-1.6.0-1.zip
. gnutls-1.6.1-1.zip
!ENDIF
!IFDEF PORTAUDIO_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@ -631,9 +635,9 @@ setup: verify_tools
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.4/gtk+-dev-2.4.14.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.4/atk-1.6.0.zip
gtk2 gtk2.4/atk-1.6.1.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.4/atk-dev-1.6.0.zip
gtk2 gtk2.4/atk-dev-1.6.1.zip
!ELSE
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2/gtk+-2.2.4-20040124.zip
@ -684,18 +688,20 @@ clean_setup:
rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05
rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5
rm -r -f $(WIRESHARK_LIBS)/glib
rm -r -f $(WIRESHARK_LIBS)/gnutls-1.6.0-1
rm -r -f $(WIRESHARK_LIBS)/gnutls-1.6.1-1
rm -r -f $(WIRESHARK_LIBS)/gtk2
rm -r -f $(WIRESHARK_LIBS)/gtk+
rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
rm -r -f $(WIRESHARK_LIBS)/lua5.1
rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.3.1
rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.4
rm -r -f $(WIRESHARK_LIBS)/pcre-6.4
rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1
rm -r -f $(WIRESHARK_LIBS)/portaudio_v19
rm -r -f $(WIRESHARK_LIBS)/WpdPack
rm -r -f $(WIRESHARK_LIBS)/Airpcap_Devpack
rm -r -f $(WIRESHARK_LIBS)/WinPcap_Devpack
rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
################################################################################

6
config.nmake
View File

@ -173,7 +173,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123-dll
# If you don't have Net-SNMP, comment this line out, so that NET_SNMP_DIR
# isn't defined.
#
NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.3.1
NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.4
#
# Optional: the ADNS library enables asynchronous (nonblocking) DNS
@ -210,7 +210,7 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4
#
# XXX - GNUTLS headers doesn't compile on MSVC 2005
!IF "$(MSVC_VARIANT)" == "MSVC6"
GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.0-1
GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
!ENDIF
#
@ -291,7 +291,7 @@ GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
# If you don't have the AirPcap developer's pack, comment this line out,
# so that AIRPCAP_DIR isn't defined.
#
#AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap
AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack

2
epan/libwireshark.def
View File

@ -15,6 +15,8 @@ address_to_str_buf
add_new_data_source
add_oid_name
add_oid_str_name
AirPDcapDestroyContext
AirPDcapInitContext
AdmissionRejectReason_vals DATA
airpdcap_ctx DATA
ansi_a_bsmap_strings DATA

2
tools/win32-setup.sh
View File

@ -4,7 +4,7 @@
# http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2006-12-22/packages"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-01-04/packages"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"