diff options
| -rw-r--r-- | Makefile.nmake | 2 | ||||
| -rw-r--r-- | config.nmake | 6 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1c6b7c0b14..f94f41f54b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -896,7 +896,7 @@ process_libs: !ENDIF !IFDEF PCAP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . WpdPack_$(PCAP_VERSION).zip + . WpdPack_$(WPD_VERSION).zip !ENDIF !IFDEF AIRPCAP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ diff --git a/config.nmake b/config.nmake index 3bf220fdeb..03ac461179 100644 --- a/config.nmake +++ b/config.nmake @@ -306,7 +306,8 @@ GTK_INST_VERSION=3.4 # PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target. -PCAP_VERSION=4_1_2 +PCAP_VERSION=4_1_3 +WPD_VERSION=4_1_2 # # Optional: WinPcap remote capture support and new API @@ -526,7 +527,8 @@ GTK_INST_VERSION=3.4 # PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target. -PCAP_VERSION=4_1_2 +PCAP_VERSION=4_1_3 +WPD_VERSION=4_1_2 # # Optional: WinPcap remote capture support and new API diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index da28cee3bc..6d8e2069d6 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1078,7 +1078,7 @@ lbl_winpcap_installed: ; Compare the installed build against the one we have. ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion" StrCmp $WINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly. - ${VersionCompare} $WINPCAP_VERSION "4.1.0.2001" $1 ; WinPcap 4.1.2 + ${VersionCompare} $WINPCAP_VERSION "4.1.0.2980" $1 ; WinPcap 4.1.3 StrCmp $1 "2" lbl_winpcap_do_install ;lbl_winpcap_dont_install: diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 76938b72f1..3023c0665b 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="2013-03-08" +export DOWNLOAD_TAG="2013-03-09" 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 f747ec5198..4891f7e399 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="2013-03-08" +export DOWNLOAD_TAG="2013-03-09" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |