summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-19 15:20:55 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-19 15:20:55 -0800
commitb67b370dba5ab69edefc05635cfe92e778479ed4 (patch)
tree70a4b71186d3ec34768e3e99313f2eebd42d3e43
parent0995c1dcaa02a61a65e447f56aec1353885530df (diff)
downloadinfinitytier-b67b370dba5ab69edefc05635cfe92e778479ed4.tar.gz
infinitytier-b67b370dba5ab69edefc05635cfe92e778479ed4.zip
docs
-rw-r--r--AUTHORS.md4
-rw-r--r--README.md2
-rw-r--r--zerotier-one.spec3
3 files changed, 3 insertions, 6 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 90a64ef6..119486fa 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -29,9 +29,9 @@ These are included in ext/ for platforms that do not have them available in comm
* LZ4 compression algorithm by Yann Collet
- * Files: ext/lz4/*
+ * Files: node/Packet.cpp (bundled within anonymous namespace)
* Home page: http://code.google.com/p/lz4/
- * License grant: BSD attribution
+ * License grant: BSD 2-clause
* http-parser by Joyent, Inc. (many authors)
diff --git a/README.md b/README.md
index f8e438fa..5c6ff381 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ For Mac, Linux, and BSD, just type `make` (or `gmake` on BSD). Platform requirem
- **Linux**: GCC/G++ 4.9 or newer or CLANG 3.4 or newer, and GNU make and standard shell tools of course.
- The Linux make file will auto-detect and prefer CLANG if present since in our experience it does a better job optimizing C++ code. You can specify CC= and CXX= on the make command line to override this behavior.
- Several distributions including CentOS 7 ship with G++ 4.8 which has broken C++11 support. If you are running CentOS 7 type `sudo yum install clang` to install CLANG 3.4, which will work fine. There is no C++11 in the ZeroTier core but we have started using it in the service and network controller code.
- - If any of the following have development headers on the system they are auto-detected and the build will link against system versions: `http-parser`, `lz4`, `libnatpmp`, and `miniupnpc`. If these are missing (or too old) the versions in `ext/` are used and are statically linked into the binary. Please be aware of this since if you build with these present the resulting binary will require them on other systems too.
+ - If any of the following have development headers on the system they are auto-detected and the build will link against system versions: `libnatpmp`, and `miniupnpc`. If these are missing (or too old) the versions in `ext/` are used and are statically linked into the binary. Please be aware of this since if you build with these present the resulting binary will require them on other systems too.
- **FreeBSD**: GCC/G++ 4.9 or newer and `gmake` since our make files use GNU extensions.
Each supported platform has its own *make-XXX.mk* file that contains the actual make rules for the platform. The right .mk file is included by the main Makefile based on the GNU make *OSTYPE* variable. Take a look at the .mk file for your platform for other targets, debug build rules, etc.
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 3c7433a9..5c561257 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -12,7 +12,6 @@ BuildRequires: systemd
%endif
%if 0%{?fedora} >= 21
-BuildRequires: lz4-devel
BuildRequires: libnatpmp-devel
BuildRequires: systemd
%endif
@@ -28,7 +27,6 @@ Requires: chkconfig
%endif
%if 0%{?fedora} >= 21
-Requires: lz4
Requires: libnatpmp
Requires: systemd
%endif
@@ -37,7 +35,6 @@ Provides: bundled(http-parser) = 2.7.0
Provides: bundled(miniupnpc) = 2.0
%if 0%{?rhel} >= 6
-Provides: bundled(lz4) = 1.7.1
Provides: bundled(libnatpmp) = 20131126
%endif