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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44888 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index 305664b94df35a851eea56843d2aed281966b41e..d08de675a1aa3052c22d285a1a2e10745068b32a 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -856,6 +856,8 @@ setup: verify_tools clean_setup process_libs
 # (The choice is determined by the value of the macro WIN_SETUP_OPT).
 process_libs:
        @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
+               . WinPcap_$(PCAP_VERSION).exe
 !IFDEF GTK_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                "$(GTK_NAME)" gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)$(PKG_SUFIX).zip

diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index 3615d4e96f2c0e3928f2022bb196874fb177f439..c1e8ec1c217487d1b95c67604eba64fdde1496c8 100644 (file)
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST = \
        VersionCompare.nsh \
        AdditionalTasksPage.ini \
        WinPcapPage.ini \
-       WinPcap_4_1_2.exe \
        Makefile.nmake \
        Custom.nmake \
        custom_plugins.txt      \

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 9a1f104929f299719eb8ce53c97fbc897d8d95f1..7446b9f1265c9820189055e2083e92c7a2fe72c6 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -18,7 +18,7 @@ EXE=../../tshark.exe ../../editcap.exe \
 !IFDEF GTK_DIR
        ../../wireshark.exe \
 !ENDIF
-       ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_$(PCAP_VERSION).exe
+       ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(PCAP_VERSION).exe
 DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll
 DOC=../../doc/ws.css                           \
        ../../doc/capinfos.html                 \
@@ -96,6 +96,7 @@ NSIS_FLAGS=\
        /DMSVC_VARIANT=$(MSVC_VARIANT) \
        /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
        /DWIRESHARK_LIB_DIR=$(WIRESHARK_LIB_DIR) \
+       /DPCAP_VERSION=$(PCAP_VERSION) \
 !IFDEF MSVCR_DLL
        /DMSVCR_DLL="$(MSVCR_DLL)" \
 !ENDIF

diff --git a/packaging/nsis/WinPcap_4_1_2.exe b/packaging/nsis/WinPcap_4_1_2.exe
deleted file mode 100755 (executable)
index 5fa0055..0000000
Binary files a/packaging/nsis/WinPcap_4_1_2.exe and /dev/null differ

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 47df79977bfcd5a71748e69426a4df88688ecc03..0d971a3d3892de2dcc2dd3617aee2f180f431a53 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -716,8 +716,8 @@ IfErrors lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not inst
 ;DetailPrint "WinPcap uninstaller returned $0"
 lbl_winpcap_notinstalled:
 SetOutPath $INSTDIR
-File "WinPcap_4_1_2.exe"
-ExecWait '"$INSTDIR\WinPcap_4_1_2.exe"' $0
+File "${WIRESHARK_LIB_DIR}\WinPcap_${PCAP_VERSION}.exe"
+ExecWait '"$INSTDIR\WinPcap_${PCAP_VERSION}.exe"' $0
 DetailPrint "WinPcap installer returned $0"
 SecRequired_skip_Winpcap:
 
@@ -1013,7 +1013,7 @@ lbl_winversion_unsupported_2000:
 
 lbl_winversion_supported:
        ; detect if WinPcap should be installed
-       WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.1.2"
+       WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap ${PCAP_VERSION}"
        ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName"
        IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed
        WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed"
@@ -1039,7 +1039,7 @@ lbl_winpcap_installed:
        ; force the user to upgrade by hand
        WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0"
        WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Flags" "DISABLED"
-       WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.1.2, please uninstall $WINPCAP_NAME manually first."
+       WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap ${PCAP_VERSION}, please uninstall $WINPCAP_NAME manually first."
        WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Flags" "DISABLED"
        Goto lbl_winpcap_done
 

diff --git a/tools/win-setup.sh b/tools/win-setup.sh
index 5945b40ef967abf30439e4644dc4ca8e99e93390..fa253322cdcb7a574a696d25f1b49ecfebccc797 100755 (executable)
--- 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 1ab9a406cc6debf423c2f1a9a2a605896bcc779f..e38462c24e281d403000c81ac3aa480853395652 100755 (executable)
--- 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 4d389784feccce5ebd035d94a891856c95d70323..59da926baf50cb00eedd25cd23d57d3ee85324b1 100755 (executable)
--- 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/`