Switch to c-ares 1.9.1.
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 8 Mar 2013 16:51:21 +0000 (16:51 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 8 Mar 2013 16:51:21 +0000 (16:51 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@48191 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.nmake
config.nmake
tools/win32-setup.sh
tools/win64-setup.sh

index 1279b5c970468e888b7063d38b410397b27946a3..1c6b7c0b14dd6d081fa27241e97f7d63d485c9da 100644 (file)
@@ -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
index e03235cfdac637840504e63dbf97b102df7537de..3bf220fdebb9d70de8ccb86fe52e86e5d1a74579 100644 (file)
@@ -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.
index 1cf97c66a6f1f03b84ba33d68cda3b4d3ab4d504..76938b72f17c6bb11ce5d96ad75dbc3033de1ff1 100755 (executable)
@@ -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/`
index c51a60dcbcbcca8178dc5a4966d9dbb33c2a4cf5..f747ec519859bbb1039afd944b3feb8fade24b8b 100755 (executable)
@@ -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/`