From: Lukáš Ježek <lukas.jezek@nic.cz>
Date: Fri, 13 Dec 2019 12:06:57 +0000 (+0100)
Subject: Update NEWS and doc
X-Git-Tag: v5.0.0~17^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e857885831f2813543e6e06e5586814f1f8f31a;p=thirdparty%2Fknot-resolver.git

Update NEWS and doc
---

diff --git a/NEWS b/NEWS
index 0e5757a78..6379783db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
-Knot Resolver 4.x.y (20yy-mm-dd)
+(??)
 ================================
 
 Improvements
 ------------
 - logging: control-socket commands don't log unless --verbose (#528)
 - use SO_REUSEPORT_LB if available (FreeBSD 12.0+)
+- lua: remove dependency on lua-socket and lua-sec, used lua-http and cqueues (#512, #521, !894)
 
 
 Knot Resolver 4.3.0 (2019-12-04)
diff --git a/doc/build.rst b/doc/build.rst
index 25479c088..33866f912 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -44,8 +44,7 @@ Resolver:
    :header: "Optional", "Needed for", "Notes"
 
    "`lua-http`_", "``modules/http``", "HTTP/2 client/server for Lua."
-   "luasocket_", "``trust anchors, modules/stats``", "Sockets for Lua."
-   "luasec_", "``trust anchors``", "TLS for Lua."
+   "`lua-cqueues`_", "``modules/graphite``", "Send statistics over the Graphite protocol."
    "cmocka_", "``unit tests``", "Unit testing framework."
    "Doxygen_", "``documentation``", "Generating API documentation."
    "Sphinx_ and sphinx_rtd_theme_", "``documentation``", "Building this
@@ -298,9 +297,8 @@ For development, it's possible to build the container directly from your git tre
 .. _pkg-config: https://www.freedesktop.org/wiki/Software/pkg-config/
 .. _libknot: https://gitlab.labs.nic.cz/knot/knot-dns
 .. _cmocka: https://cmocka.org/
-.. _luasec: https://luarocks.org/modules/brunoos/luasec
-.. _luasocket: https://luarocks.org/modules/luarocks/luasocket
 .. _lua-http: https://luarocks.org/modules/daurnimator/http
+.. _lua-cqueues: https://25thandclement.com/~william/projects/cqueues.html
 .. _boot2docker: http://boot2docker.io/
 .. _deckard: https://gitlab.labs.nic.cz/knot/deckard
 .. _libsystemd: https://www.freedesktop.org/wiki/Software/systemd/