diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-03-08 16:51:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-03-08 16:51:21 +0000 |
| commit | ac364779f7acbbb76115de16037efaaee9f6913d (patch) | |
| tree | 637d828fbdcb83e5d60c6a695aa3682e6a59b2ca | |
| parent | 826c14b456f0eefba15bcc0a645fd78e3b1012b0 (diff) | |
Switch to c-ares 1.9.1.
svn path=/trunk/; revision=48191
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1279b5c970..1c6b7c0b14 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -972,6 +972,7 @@ clean_setup: rm -r -f c-ares-1.6.0ws rm -r -f c-ares-1.7.0-win??ws rm -r -f c-ares-1.7.1-win??ws + rm -r -f c-ares-1.9.1-win??ws rm -r -f gettext-0.14.5 rm -r -f gettext-runtime-0.17 rm -r -f gettext-runtime-0.17-1 diff --git a/config.nmake b/config.nmake index e03235cfda..3bf220fdeb 100644 --- a/config.nmake +++ b/config.nmake @@ -354,7 +354,7 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125 # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_PKG=1.7.1 +C_ARES_PKG=1.9.1-1 # # Optional: the GnuTLS library enables ssl decryption. @@ -574,7 +574,7 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125 # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_PKG=1.7.1 +C_ARES_PKG=1.9.1-1 # # Optional: the GnuTLS library enables ssl decryption. diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 1cf97c66a6..76938b72f1 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-02-19" +export DOWNLOAD_TAG="2013-03-08" 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 c51a60dcbc..f747ec5198 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-02-19" +export DOWNLOAD_TAG="2013-03-08" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |