merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Mon, 27 Jan 2020 11:34:36 +0100
branchsync
changeset 43629d62b5b79f73
parent 4361 f13151f0b577
parent 4359 2610c483ac63
child 4363 5cf6a03ac9be
merge
     1.1 --- a/doc/readme.md	Mon Jan 27 11:33:24 2020 +0100
     1.2 +++ b/doc/readme.md	Mon Jan 27 11:34:36 2020 +0100
     1.3 @@ -13,7 +13,12 @@
     1.4      - GnuPG version 2.1.17 or later with GPGME (at least version 1.7.0) [https://gnupg.org/](https://gnupg.org/)
     1.5      - For platforms not supporting pinentry (e.g. Android) - GnuPG version 2.0.30 with GPGME version 1.6.0 (or later) [https://gnupg.org/](https://gnupg.org/)
     1.6      - a fork of NetPGP, [https://pep.foundation/dev/repos/netpgp-et/](https://pep.foundation/dev/repos/netpgp-et/)
     1.7 -  - a fork of libetpan, [https://github.com/fdik/libetpan](https://github.com/fdik/libetpan)
     1.8 +    - Sequoia, which in turn requires:
     1.9 +      - Rust
    1.10 +      - libnettle
    1.11 +  - One of the following MIME libraries:
    1.12 +    - a fork of libetpan, [https://github.com/fdik/libetpan](https://github.com/fdik/libetpan)
    1.13 +    - pEpMIME
    1.14    - zlib, [http://zlib.net/](http://zlib.net/)
    1.15    - libcurl (Only with NetPGP), [https://curl.haxx.se/libcurl/](https://curl.haxx.se/libcurl/)
    1.16    - libuuid, [https://www.kernel.org/pub/linux/utils/util-linux/](https://www.kernel.org/pub/linux/utils/util-linux/)
    1.17 @@ -22,6 +27,8 @@
    1.18  - compile-time dependencies
    1.19    - asn1c (version v0.9.28), [http://lionet.info/asn1c/blog/](http://lionet.info/asn1c/blog/)
    1.20    - yml2, [https://fdik.org/yml//toolchain](https://fdik.org/yml//toolchain)
    1.21 +    - Python 3
    1.22 +    - LXML
    1.23    - One of the following build systems:
    1.24      - GNU make (on Linux and macOS)
    1.25      - MSBuild distributed with Microsoft Visual Studio 2015 (on Windows)
    1.26 @@ -30,6 +37,7 @@
    1.27      - Apple "clang" LLVM (on MacOS)
    1.28      - Microsoft MSVC/MSVC++ distributed with Microsoft Visual Studio 2015 (on Windows)
    1.29    - A script for compiling OpenSSL for iOS, [https://github.com/sinofool/build-openssl-ios/](https://github.com/sinofool/build-openssl-ios/)
    1.30 +  - binutils
    1.31  
    1.32  # The pEp Engine's databases
    1.33  The p≡p Engine uses two databases: