diff options
| -rw-r--r-- | doc/tor-osx-dmg-creation.txt | 10 | ||||
| -rw-r--r-- | doc/tor-rpm-creation.txt | 2 | ||||
| -rw-r--r-- | doc/tor-win32-mingw-creation.txt | 8 | ||||
| -rw-r--r-- | tor.spec.in | 3 |
4 files changed, 10 insertions, 13 deletions
diff --git a/doc/tor-osx-dmg-creation.txt b/doc/tor-osx-dmg-creation.txt index ee0ec0ca96..05a8181d09 100644 --- a/doc/tor-osx-dmg-creation.txt +++ b/doc/tor-osx-dmg-creation.txt @@ -69,7 +69,7 @@ Extract the tarball. 11) Update three variables in contrib/osx/package.sh: PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip -TORBUTTON_PATH=~/tmp/torbutton-1.1.8-alpha.xpi +TORBUTTON_PATH=~/tmp/torbutton-1.1.9.1-alpha.xpi TORBUTTON_LIC_PATH=~/tmp/LICENSE Make sure the paths are correct. The build will fail if they are not. @@ -80,8 +80,7 @@ CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \ LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ CONFDIR=/Library/Tor \ ./configure --prefix=/Library/Tor --bindir=/Library/Tor \ ---sysconfdir=/Library --enable-static --disable-shared \ ---disable-dependency-tracking +--sysconfdir=/Library --disable-dependency-tracking 13) "make dist-osx" @@ -138,7 +137,7 @@ tarball. 4) Update three variables in contrib/osx/package.sh: PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip -TORBUTTON_PATH=~/tmp/torbutton-1.1.8-alpha.xpi +TORBUTTON_PATH=~/tmp/torbutton-1.1.9.1-alpha.xpi TORBUTTON_LIC_PATH=~/tmp/LICENSE Make sure the paths are correct. The build will fail if they are not. @@ -146,8 +145,7 @@ Make sure the paths are correct. The build will fail if they are not. 5) In the top level, this means /path/to/tor/, not tor/contrib/osx, do a configure with these parameters: CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \ - --bindir=/Library/Tor --sysconfdir=/Library \ - --enable-eventdns --enable-static --disable-shared + --bindir=/Library/Tor --sysconfdir=/Library 6) In same top level dir, do a "make dist-osx". There now exists a .dmg file in the same directory. Install from this dmg. diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index 0a819ff74e..034568d852 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -58,7 +58,7 @@ The process used to create the distributed rpms is as follows: Download and Extract the latest tor source code from https://www.torproject.org/. In the Tor directory: -./configure --enable-eventdns --enable-static --disable-shared +./configure make dist-rpm You should have at least two, maybe three, rpms. There should be the binary diff --git a/doc/tor-win32-mingw-creation.txt b/doc/tor-win32-mingw-creation.txt index f7515afe40..43438454d5 100644 --- a/doc/tor-win32-mingw-creation.txt +++ b/doc/tor-win32-mingw-creation.txt @@ -27,15 +27,15 @@ Stage Two: Download, extract, compile openssl ---------------------------------------------- Download openssl: -http://www.openssl.org/source/openssl-0.9.8e.tar.gz +http://www.openssl.org/source/openssl-0.9.8g.tar.gz Extract openssl: Copy the openssl tarball into the "tor-mingw" directory. Type "cd tor-mingw/" -Type "tar zxf openssl-0.9.8e.tar.gz" +Type "tar zxf openssl-0.9.8g.tar.gz" Make openssl libraries: -Type "cd tor-mingw/openssl-0.9.8e/" +Type "cd tor-mingw/openssl-0.9.8g/" Type "./Configure -no-idea -no-rc5 -no-mdc2 mingw" Edit Makefile and remove the "test:" and "tests:" sections. Type "rm -rf ./test" @@ -107,7 +107,7 @@ Extract Tor: Type "tar zxf latest-tor-alpha.tar.gz" cd tor-<version> -Type "./configure --enable-static --disable-shared" +Type "./configure" Type "make" You now have a tor.exe in src/or/. This is Tor. diff --git a/tor.spec.in b/tor.spec.in index e4b5091eaa..38eec2b8e8 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -170,8 +170,7 @@ for high-stakes anonymity. %build %if %{is_suse} %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \ - --build=%{_host} --host=%{_host} --target=%{_host} \ - --enable-static --disable-shared + --build=%{_host} --host=%{_host} --target=%{_host} %else %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \ --build=%{_host} --host=%{_host} --target=%{_host} |