X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Finstallation.html;h=a384626f8eb1b4e2a68621f934a65c710eda683e;hb=ab1954feed634fdbcf43ac5087615f9874fe06f2;hp=08b74c5bbbba976e763399a89ab50a0f9676ead4;hpb=0a92b2ac7353cd3de79efebcdd3bdf6f5a9e386d;p=privoxy.git
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 08b74c5b..a384626f 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -128,8 +128,8 @@
- tar xzvf privoxy-3.0.33-beta-src.tar.gz
- cd privoxy-3.0.33-beta
+ tar xzvf privoxy-3.0.33-beta-src.tar.gz
+ cd privoxy-3.0.33-beta
|
@@ -171,13 +171,13 @@
- autoheader
- autoconf
- ./configure # (--help to see options)
- make # (the make from GNU, sometimes called gmake)
- su # Possibly required
- make -n install # (to see where all the files will go)
- make -s install # (to really install, -s to silence output)
+ autoheader
+ autoconf
+ ./configure # (--help to see options)
+ make # (the make from GNU, sometimes called gmake)
+ su # Possibly required
+ make -n install # (to see where all the files will go)
+ make -s install # (to really install, -s to silence output)
|
@@ -197,7 +197,7 @@
- ./configure --disable-toggle --disable-editor --disable-force
+ ./configure --disable-toggle --disable-editor --disable-force
|
@@ -217,7 +217,7 @@
- make -s install USER=privoxy GROUP=privoxy
+ make -s install USER=privoxy GROUP=privoxy
|
@@ -326,13 +326,83 @@
If you want to be able to make a Windows release package, get the NSIS .zip file from https://sourceforge.net/projects/nsis/files/NSIS%203/ and extract the NSIS directory to privoxy/windows. Then edit the windows/GNUmakefile to set the location of the NSIS executable
- - eg:
+ "LITERAL">/<root-dir>/nsis/. Then edit the windows/GNUmakefile to set
+ the location of the NSIS executable - eg:
- # Path to NSIS
-MAKENSIS = ./nsis/makensis.exe
+ # Path to NSIS
+ MAKENSIS = /<root-dir>/nsis/makensis.exe
+ |
+
+
+ Get the latest 8.x PCRE code from PCRE
+ https://ftp.pcre.org/pub/pcre/ and build the static PCRE libraries with
+
+
+
+ export CFLAGS="-O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2"
+ export LDFLAGS="-fstack-protector-strong"
+ export CPPFLAGS="-DPCRE_STATIC"
+
+ ./configure --host=i686-w64-mingw32 \
+ --prefix=/usr/local/i686-w64-mingw32 \
+ --enable-utf --enable-unicode-properties \
+ --enable-jit \
+ --enable-newline-is-anycrlf \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --disable-pcregrep-libbz2 \
+ --disable-pcregrep-libz \
+ --disable-pcretest-libreadline \
+ --disable-stack-for-recursion \
+ --enable-static --disable-shared \
+ && make
+ |
+
+
+ If you want to be able to have Privoxy do TLS Inspection, get the latest 2.16.x MBED-TLS library source
+ code from https://github.com/ARMmbed/mbedtls/tags, extract the tar file into <root-dir> and build the static libraries with
+
+
+
+ export WINDOWS_BUILD=1
+ # build for a Windows platform
+
+ unset DEBUG
+
+ export CC=i686-w64-mingw32-gcc
+ export LD=i686-w64-mingw32-gcc
+ export CFLAGS="-O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2"
+ export LDFLAGS="${LDFLAGS} -fstack-protector-strong"
+
+ make lib
+ # build the libraries
+ |
+
+
+ Get the brotli library from https://github.com/google/brotli/releases and build the static libraries with
+
+
+
+ ./bootstrap
+ # to create the GNU autotools files
+
+ autoconf
+
+ export CFLAGS="-O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2"
+ export LDFLAGS="${LDFLAGS} -fstack-protector-strong"
+
+ ./configure --host=i686-w64-mingw32 \
+ --prefix=/usr/local/i686-w64-mingw32 \
+ --enable-static \
+ --disable-shared \
+ --with-gnu-ld \
+ --disable-silent-rules \
+ && make
|
@@ -353,10 +423,10 @@ MAKENSIS = ./nsis/makensis.exe
- $ autoheader # creates config.h.in
- $ autoconf # uses config.h.in to create the configure shell script
- $ ./configure [options] # creates GNUmakefile
- $ make [options] # builds the program
+ autoheader # creates config.h.in
+ autoconf # uses config.h.in to create the configure shell script
+ ./configure [options] # creates GNUmakefile
+ make [options] # builds the program
|
@@ -370,7 +440,8 @@ MAKENSIS = ./nsis/makensis.exe
--enable-zlib
--enable-static-linking
--disable-pthread
- --disable-dynamic-pcre
+ --with-brotli
+ --with-mbedtls
@@ -382,7 +453,7 @@ MAKENSIS = ./nsis/makensis.exe
$ export CFLAGS="-O2" # set gcc optimization level
$ export LDFLAGS="-Wl,--nxcompat" # Enable DEP
$ ./configure --host=i686-w64-mingw32 --enable-mingw32 --enable-zlib \
- > --enable-static-linking --disable-pthread --disable-dynamic-pcre
+ > --enable-static-linking --disable-pthread
$ make # build Privoxy