ci+docs: remove all references to cryptopp/crypto++
Also update COPYING
refs: #3946
Change-Id: I87ded823f806857bb27079648e51619bb9dde6bc
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 6038165..7ca660f 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -7,7 +7,7 @@
set -x
if has OSX $NODE_LABELS; then
- FORMULAE=(boost pkg-config cryptopp log4cxx openssl)
+ FORMULAE=(boost pkg-config log4cxx openssl)
brew update
if [[ -n $TRAVIS ]]; then
# travis images come with a large number of brew packages
@@ -26,8 +26,7 @@
if has Ubuntu $NODE_LABELS; then
sudo apt-get -qq update
sudo apt-get -qy install build-essential pkg-config libboost-all-dev \
- libcrypto++-dev libsqlite3-dev libssl-dev \
- liblog4cxx10-dev
+ libsqlite3-dev libssl-dev liblog4cxx10-dev
if [[ $JOB_NAME == *"code-coverage" ]]; then
sudo apt-get -qy install lcov libgd-perl python-setuptools
diff --git a/COPYING.md b/COPYING.md
index 3c7c3bf..3ff9a6f 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,8 +1,7 @@
NLSR LICENSE
============
-NLSR is released under the GPL with the additional exemption that
-compiling, linking, and/or using OpenSSL is allowed.
+NLSR is released under the GPL.
NLSR relies on third-party software and libraries, licensed under the following
licenses:
@@ -10,30 +9,17 @@
- Boost libraries are licensed under the conditions of
[Boost Software License 1.0](http://www.boost.org/users/license.html)
-- CryptoPP library is licensed under the conditions of
- [Boost Software License 1.0](http://www.boost.org/users/license.html)
-
- log4cxx is licensed under the conditions of
[Apache License, Version 2.0](https://logging.apache.org/log4cxx/license.html)
- ndn-cxx is licensed under the conditions of
[LGPL 3.0](https://github.com/named-data/ndn-cxx/blob/master/COPYING.md)
-- SQLite is in [public domain](http://www.sqlite.org/copyright.html)
+- ChronoSync is licensed under the conditions of
+ [GPL 3.0](https://github.com/named-data/ChronoSync/blob/master/COPYING.md)
- waf build system is licensed under the conditions of
- [BSD license](https://github.com/named-data/ndn-cxx/blob/master/waf)
-
-NLSR also relies on third-party libraries with non-GPL compatible licenses.
-These libraries fall into the category of "System Libraries" under GPL
-license definitions and are used in accordance with the GPL license exception
-for "System Libraries":
-
-- OpenSSL is licensed under an
- [Apache-style licence](http://www.openssl.org/source/license.html)
-
-- (OS X platform only) OS X Security Framework is licensed under
- [Apple Public Source License](http://www.opensource.apple.com/license/apsl/)
+ [BSD license](https://github.com/named-data/NLSR/blob/master/waf)
The GPL license is provided below in this file.
For more information, see http://www.gnu.org/licenses/