Remove our local copy of WinPcap and download it from

wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.

svn path=/trunk/; revision=44888

3 files changed, 17 insertions, 15 deletions

diff --git a/tools/win-setup.sh b/tools/win-setup.sh
index 5945b40ef9..fa253322cd 100755
--- a/tools/win-setup.sh
+++ b/tools/win-setup.sh
@@ -177,19 +177,21 @@ case "$1" in
 		err_exit "Can't download $DOWNLOAD_PREFIX/$PACKAGE_PATH"
 	cd "$DEST_SUBDIR" || err_exit "Can't find $DEST_SUBDIR"
 	echo "Extracting '$DEST_PATH/$PACKAGE' into '$DEST_PATH/$DEST_SUBDIR'"
-	unzip -oq "$DEST_PATH/$PACKAGE" ||
-		err_exit "Couldn't unpack '$DEST_PATH/$PACKAGE'"
-	echo "Verifying that the DLLs and EXEs in $DEST_SUBDIR are executable."
-	# XX: Note that find will check *all* dlls/exes in DEST_SUBDIR and below
-	#     which may be more than those just unzipped depending upon DEST_SUBDIR.
-	#     This may cause extra repeated checks but will do no harm.
-	for i in $(/usr/bin/find . \( -name '*\.dll' -o -name '*\.exe' \)) ; do
-		if [ ! -x "$i" ] ; then
-			echo "Changing file permissions (add executable bit) to:"
-			echo "$i"
-			chmod a+x "$i"
-		fi
-	done
+        if [[ "$PACKAGE" == *.zip ]] ; then
+            unzip -oq "$DEST_PATH/$PACKAGE" ||
+                    err_exit "Couldn't unpack '$DEST_PATH/$PACKAGE'"
+            echo "Verifying that the DLLs and EXEs in $DEST_SUBDIR are executable."
+            # XX: Note that find will check *all* dlls/exes in DEST_SUBDIR and below
+            #     which may be more than those just unzipped depending upon DEST_SUBDIR.
+            #     This may cause extra repeated checks but will do no harm.
+            for i in $(/usr/bin/find . \( -name '*\.dll' -o -name '*\.exe' \)) ; do
+                    if [ ! -x "$i" ] ; then
+                            echo "Changing file permissions (add executable bit) to:"
+                            echo "$i"
+                            chmod a+x "$i"
+                    fi
+            done
+        fi
 	;;
 --settag)
 	if [ -z "$2" ] ; then
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 1ab9a406cc..e38462c24e 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="2012-05-30"
+export DOWNLOAD_TAG="2012-09-13"
 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 4d389784fe..59da926baf 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="2012-06-06"
+export DOWNLOAD_TAG="2012-09-13"
 export WIRESHARK_TARGET_PLATFORM="win64"
 
 WIN_SETUP=`echo $0 | sed -e s/win64/win/`