diff --git a/build_nsis.sh b/build_nsis.sh deleted file mode 100755 index e41bc362c..000000000 --- a/build_nsis.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -if [ -d nsis.in ]; then - /bin/rm -r nsis.in -fi - -unzip -j -d nsis.in $1 -VER=`echo $1 | sed "s/.*wpa_supplicant-windows-bin-\(.*\).zip/\1/"` - -cat wpa_supplicant/wpa_supplicant.nsi | - sed "s/@WPAVER@/$VER/g" \ - > nsis.in/wpa_supplicant.nsi - -makensis nsis.in/wpa_supplicant.nsi - -/bin/rm -r nsis.in diff --git a/build_release b/build_release index 22dcd4219..dddf92b5b 100755 --- a/build_release +++ b/build_release @@ -1,11 +1,9 @@ #!/bin/sh -WINLOCAL=/home/jm/H-win/local - set -e if [ -z "$1" ]; then - echo "build_release [nobin]" + echo "build_release " exit 1 fi @@ -47,102 +45,3 @@ rm -f wpa_supplicant-$VER/wpa_supplicant/doc/docbook/manpage.{links,refs} tar czf $RELDIR/wpa_supplicant-$VER.tar.gz wpa_supplicant-$VER cd .. rm -r $TMP - -if [ "$2" = "nobin" ]; then - exit 0 -fi - - -cd $RELDIR - - PDIR=wpa_supplicant-$VER - WDIR=wpa_supplicant-windows-bin-$VER - tar xzf $PDIR.tar.gz - mkdir "$WDIR" - cd "$PDIR/wpa_supplicant" - cat > .config <> .config < ../../"$WDIR"/$i - done - for i in README README-Windows.txt wpa_supplicant.conf; do - unix2dos < $i > ../../"$WDIR"/$i - done - mv *.exe ../../"$WDIR" - cp win_example.reg ../../"$WDIR" - - cd wpa_gui-qt4 - make -C icons - qmake -spec win32-x-g++ - make -j2 - cp release/wpa_gui.exe ../../../"$WDIR" - lrelease wpa_gui.pro - cp lang/wpa_gui_de.qm ../../../"$WDIR" - cd ../../.. - rm -rf "$PDIR" - zip "$WDIR.zip" "$WDIR"/* - rm -rf "$WDIR" - -cd $RELDIR/.. - -./build_nsis.sh "$RELDIR/$WDIR.zip" -mv wpa_supplicant-$VER.exe $RELDIR - -ls -l $RELDIR/*$VER* - -exit 0 diff --git a/wpa_supplicant/README-Windows.txt b/wpa_supplicant/README-Windows.txt index ae2cdc1e9..7288abd9a 100644 --- a/wpa_supplicant/README-Windows.txt +++ b/wpa_supplicant/README-Windows.txt @@ -7,11 +7,6 @@ All Rights Reserved. This program is licensed under the BSD license (the one with advertisement clause removed). -This product includes software developed by the OpenSSL Project -for use in the OpenSSL Toolkit (http://www.openssl.org/). This -product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). - wpa_supplicant has support for being used as a WPA/WPA2/IEEE 802.1X Supplicant on Windows. The current port requires that WinPcap @@ -35,20 +30,6 @@ authentication and successfully ping a wired host): - WPA2-EAP, TKIP, CCMP, TKIP+CCMP -Binary version --------------- - -Compiled binary version of the wpa_supplicant and additional tools is -available from http://w1.fi/wpa_supplicant/. These binaries can be -used after installing WinPcap. - -wpa_gui uses Qt 4 framework and may need additional dynamic libraries -(DLLs). These libraries are available from -http://w1.fi/wpa_supplicant/qt4/wpa_gui-qt433-windows-dll.zip -You can copy the DLL files from this ZIP package into the same directory -with wpa_gui.exe to allow wpa_gui to be started. - - Building wpa_supplicant with mingw ---------------------------------- @@ -316,135 +297,3 @@ HKEY_LOCAL_MACHINE\SOFTWARE\wpa_supplicant\configs\test\networks\0000 See win_example.reg for an example on how to setup wpasvc.exe parameters in registry. It can also be imported to registry as a starting point for the configuration. - - - -License information for third party software used in this product: - - OpenSSL License - --------------- - -/* ==================================================================== - * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - - - - Qt Open Source Edition - ---------------------- - -The Qt GUI Toolkit is Copyright (C) 1994-2007 Trolltech ASA. -Qt Open Source Edition is licensed under GPL version 2. - -Source code for the library is available at -http://w1.fi/wpa_supplicant/qt4/qt-win-opensource-src-4.3.3.zip diff --git a/wpa_supplicant/wpa_supplicant.nsi b/wpa_supplicant/wpa_supplicant.nsi deleted file mode 100644 index b9f016287..000000000 --- a/wpa_supplicant/wpa_supplicant.nsi +++ /dev/null @@ -1,112 +0,0 @@ -!define PRODUCT_NAME "wpa_supplicant" -!define PRODUCT_VERSION "@WPAVER@" -!define PRODUCT_PUBLISHER "Jouni Malinen" - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -outfile "../wpa_supplicant-@WPAVER@.exe" - -installDir "$PROGRAMFILES\wpa_supplicant" - -Page Directory -Page InstFiles - -section -Prerequisites - SetOutPath $INSTDIR\Prerequisites - MessageBox MB_YESNO "Install WinPcap?" /SD IDYES IDNO endWinPcap - File "/opt/Qt-Win/files/WinPcap_4_1_2.exe" - ExecWait "$INSTDIR\Prerequisites\WinPcap_4_1_2.exe" - Goto endWinPcap - endWinPcap: -sectionEnd - - -section - setOutPath $INSTDIR - - File wpa_gui.exe - File wpa_gui_de.qm - File wpa_cli.exe - File COPYING - File README - File README-Windows.txt - File win_example.reg - File win_if_list.exe - File wpa_passphrase.exe - File wpa_supplicant.conf - File wpa_supplicant.exe - File wpasvc.exe - - File /opt/Qt-Win/files/mingwm10.dll - File /opt/Qt-Win/files/libgcc_s_dw2-1.dll - File /opt/Qt-Win/files/QtCore4.dll - File /opt/Qt-Win/files/QtGui4.dll - - WriteRegDWORD HKLM "Software\wpa_supplicant" "debug_level" 0 - WriteRegDWORD HKLM "Software\wpa_supplicant" "debug_show_keys" 0 - WriteRegDWORD HKLM "Software\wpa_supplicant" "debug_timestamp" 0 - WriteRegDWORD HKLM "Software\wpa_supplicant" "debug_use_file" 0 - - WriteRegDWORD HKLM "Software\wpa_supplicant\configs\default" "ap_scan" 2 - WriteRegDWORD HKLM "Software\wpa_supplicant\configs\default" "update_config" 1 - WriteRegDWORD HKLM "Software\wpa_supplicant\configs\default\networks" "dummy" 1 - DeleteRegValue HKLM "Software\wpa_supplicant\configs\default\networks" "dummy" - - WriteRegDWORD HKLM "Software\wpa_supplicant\interfaces" "dummy" 1 - DeleteRegValue HKLM "Software\wpa_supplicant\interfaces" "dummy" - - writeUninstaller "$INSTDIR\uninstall.exe" - - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wpa_supplicant" \ - "DisplayName" "wpa_supplicant" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wpa_supplicant" \ - "UninstallString" "$INSTDIR\uninstall.exe" - - CreateDirectory "$SMPROGRAMS\wpa_supplicant" - CreateShortCut "$SMPROGRAMS\wpa_supplicant\wpa_gui.lnk" "$INSTDIR\wpa_gui.exe" - CreateShortCut "$SMPROGRAMS\wpa_supplicant\Uninstall.lnk" "$INSTDIR\uninstall.exe" - - ExecWait "$INSTDIR\wpasvc.exe reg" -sectionEnd - - -Function un.onInit - MessageBox MB_YESNO "This will uninstall wpa_supplicant. Continue?" IDYES NoAbort - Abort - NoAbort: -FunctionEnd - -section "uninstall" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wpa_supplicant" - delete "$INSTDIR\uninstall.exe" - - ExecWait "$INSTDIR\wpasvc.exe unreg" - - DeleteRegKey HKLM "Software\wpa_supplicant" - - delete "$INSTDIR\wpa_gui.exe" - delete "$INSTDIR\wpa_gui_de.qm" - delete "$INSTDIR\wpa_cli.exe" - delete "$INSTDIR\COPYING" - delete "$INSTDIR\README" - delete "$INSTDIR\README-Windows.txt" - delete "$INSTDIR\win_example.reg" - delete "$INSTDIR\win_if_list.exe" - delete "$INSTDIR\wpa_passphrase.exe" - delete "$INSTDIR\wpa_supplicant.conf" - delete "$INSTDIR\wpa_supplicant.exe" - delete "$INSTDIR\wpasvc.exe" - - delete "$INSTDIR\mingwm10.dll" - delete "$INSTDIR\libgcc_s_dw2-1.dll" - delete "$INSTDIR\QtCore4.dll" - delete "$INSTDIR\QtGui4.dll" - - delete "$INSTDIR\Prerequisites\WinPcap_4_1_2.exe" - rmdir "$INSTDIR\Prerequisites" - - rmdir "$INSTDIR" - - delete "$SMPROGRAMS\wpa_supplicant\wpa_gui.lnk" - delete "$SMPROGRAMS\wpa_supplicant\Uninstall.lnk" - rmdir "$SMPROGRAMS\wpa_supplicant" -sectionEnd