diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-03-26 18:36:27 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-03-26 18:36:27 +0000 |
| commit | 12e2df52e1dc95bad99dcb97a881daddbd49b404 (patch) | |
| tree | 6503b8ea7d54098a2455397cb72ca377a21aefd0 | |
| parent | 325ed3bfbb1bbed03f600b7315bd75bfee763800 (diff) | |
Update c-ares to 1.7.1.
svn path=/trunk/; revision=32293
| -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 3997f7b1f3..799425eeb0 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -849,6 +849,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/c-ares-1.5.3ws rm -r -f $(WIRESHARK_LIBS)/c-ares-1.6.0ws rm -r -f $(WIRESHARK_LIBS)/c-ares-1.7.0-win??ws + rm -r -f $(WIRESHARK_LIBS)/c-ares-1.7.1-win??ws rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5 rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17 rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17-1 diff --git a/config.nmake b/config.nmake index 3decc3d6a1..843dd13f92 100644 --- a/config.nmake +++ b/config.nmake @@ -227,7 +227,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123 # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_PKG=1.7.0 +C_ARES_PKG=1.7.1 # # Optional: the PCRE (Perl Compatible Regular Expressions) library @@ -436,7 +436,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123 # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_PKG=1.7.0 +C_ARES_PKG=1.7.1 # # Optional: the PCRE (Perl Compatible Regular Expressions) library diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index b082219723..20d887b6cf 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="2010-02-24" +export DOWNLOAD_TAG="2010-03-26" 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 3fd86c9dd8..7740d084ff 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="2010-02-24" +export DOWNLOAD_TAG="2010-03-26" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |