From 011941853cc7f7211b1d57b0b43b6bbbfb013ad1 Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Sat, 22 Sep 2007 20:26:06 +0000 Subject: [PATCH] Remove openssl static libs from the win32 distrubution. They are statically compiled into the exe. Add some, take some, remove some TODO items. svn:r11583 --- contrib/package_nsis-mingw.sh | 2 -- contrib/tor-mingw.nsi.in | 7 ------- doc/TODO | 18 +++++++----------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 439c6352b8..c15ba9a432 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -21,8 +21,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 dd89b22963..e6acbe0b92 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -91,12 +91,6 @@ Section "Tor" Tor File /oname=$configfile "..\src\config\torrc.sample" SectionEnd -Section "OpenSSL 0.9.8d" 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" diff --git a/doc/TODO b/doc/TODO index 92718482d8..fb023e16b5 100644 --- a/doc/TODO +++ b/doc/TODO @@ -209,14 +209,10 @@ P - Can we switch to polipo? Please? P - If we haven't replaced privoxy, lock down its configuration in all packages, as documented in tor-doc-unix.html P - Figure out why dll's compiled in mingw don't work right in WinXP. -P - Figure out why openssl 0.9.8e "make test" fails at sha256t test. -P - Figure out if including RSA and IDEA are bad for Tor from a legal - perspective P - Create packages for Nokia 800, requested by Chris Soghoian P - Consider creating special Tor-Polipo-Vidalia test packages, requested by Dmitri Vitalev - Get Vidalia supporting protocolinfo and using auth by default. - - Try to get newer Torbuttons into the windows bundle. Nice-to-have items for 0.2.0.x, time permitting: - Proposals @@ -520,20 +516,20 @@ P - document http://wiki.noreply.org/noreply/TheOnionRouter/TransparentProxy on P - figure out why x86_64 won't build rpms from tor.spec P - figure out spec files for bundles of vidalia-tor-polipo P - figure out polipo install scripts for bundles of vidalia-tor-polipo on osx, win32 -P - evaluate https://sourceforge.net/projects/kleanup/ -P - evaluate TorK P - figure out selinux policy for tor P - change packaging system to more automated and specific for each platform, suggested by Paul Wouter +P - Setup repos for redhat and suse rpms & start signing the rpms the + way package management apps prefer Website: - - tor-in-the-media page - . more pictures from ren. he wants to describe the tor handshake +P - tor-in-the-media page + - more pictures from ren. he wants to describe the tor handshake - Figure out licenses for website material. - - and remove home and make the "Tor" picture be the link to home. - - put the logo on the website, in source form, so people can put it on +P - and remove home and make the "Tor" picture be the link to home. +P - put the logo on the website, in source form, so people can put it on stickers directly, etc. - - put the source image for the stickers on the website, so people can +P - put the source image for the stickers on the website, so people can print their own R - make a page with the hidden service diagrams. - ask Jan to be the translation coordinator? add to volunteer page. -- 2.11.4.GIT