backport the removal of openssl from trunk

svn:r12322

2 files changed, 35 insertions, 10 deletions

diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh
index 439c6352b8..e562a78634 100644
--- a/contrib/package_nsis-mingw.sh
+++ b/contrib/package_nsis-mingw.sh
@@ -1,5 +1,39 @@
 #!/bin/sh
 #
+# ===============================================================================
+# package_nsis-ming.sh is distributed under this license:
+
+# Copyright (c) 2006-2007 Andrew Lewman
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+
+#     * 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.
+
+#     * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "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 COPYRIGHT
+# OWNER 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.
+# ===============================================================================
+
 # Script to package a Tor installer on win32.  This script assumes that
 # you have already built Tor, that you are running msys/mingw, and that
 # you know what you are doing.
@@ -21,8 +55,6 @@ mkdir win_tmp/tmp
 
 cp src/or/tor.exe win_tmp/bin/
 cp src/tools/tor-resolve.exe win_tmp/bin/
-cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin/
-cp /usr/local/ssl/lib/libssl.a win_tmp/bin/
 cp contrib/tor.ico win_tmp/bin/
 
 # YOU must copy torbutton xpi into the contrib dir
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 37a0cd89d9..1b8f7ed640 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -10,7 +10,7 @@
 !define WEBSITE "https://www.torproject.org/"
 
 !define LICENSE "LICENSE"
-;BIN is where it expects to find tor.exe, tor-resolve.exe, libcrypto.a and libssl.a
+;BIN is where it expects to find tor.exe and tor-resolve.exe
 !define BIN "..\bin"
 
 SetCompressor lzma
@@ -91,12 +91,6 @@ Section "Tor" Tor
    File /oname=$configfile "..\src\config\torrc.sample"
 SectionEnd
 
-Section "OpenSSL 0.9.8e" OpenSSL
-   SetOutPath $INSTDIR
-   File "${BIN}\libcrypto.a"
-   File "${BIN}\libssl.a"
-SectionEnd
-
 Section "Documents" Docs
    SetOutPath "$INSTDIR\Documents"
    ;File "doc\FAQ"
@@ -200,7 +194,6 @@ SectionEnd
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "The core executable and config files needed for Tor to run."
-  !insertmacro MUI_DESCRIPTION_TEXT ${OpenSSL} "OpenSSL libraries required by Tor."
   !insertmacro MUI_DESCRIPTION_TEXT ${Docs} "Documentation about Tor."
   !insertmacro MUI_DESCRIPTION_TEXT ${ShortCuts} "Shortcuts to easily start Tor"
   !insertmacro MUI_DESCRIPTION_TEXT ${StartMenu} "Shortcuts to access Tor and it's documentation from the Start Menu"