From: Vasek Sraier <git@vakabus.cz>
Date: Tue, 10 Jan 2023 21:48:18 +0000 (+0100)
Subject: Merge branch 'master' into manager
X-Git-Tag: v6.0.0a1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=362db46d8fcf51db1884bb18b30d36f10fba9ece;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into manager
---

362db46d8fcf51db1884bb18b30d36f10fba9ece
diff --cc .gitlab-ci.yml
index ac7cc46e1,344933766..98925873f
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -117,12 -122,9 +127,12 @@@ build-knot32
  
  build-asan:
    <<: *build
 +  except:
 +    refs:
 +      - /^manager.*$/
    script:
        # "undefined" sanitizer causes C++ issues when loading ahocorasick.so in CI
-     - CC=clang CXX=clang++ CFLAGS=-fno-sanitize-recover=all CXXFLAGS=-fno-sanitize=undefined meson build_ci_asan --default-library=static --prefix=$PREFIX -Db_sanitize=address,undefined -Dextra_tests=enabled
+     - CC=clang CXX=clang++ CFLAGS=-fno-sanitize-recover=all CXXFLAGS=-fno-sanitize=undefined meson build_ci_asan --default-library=static --prefix=$PREFIX -Dmalloc=jemalloc -Db_sanitize=address,undefined -Dextra_tests=enabled
      - ninja -C build_ci_asan
      - ninja -C build_ci_asan install >/dev/null
        # TODO _leaks: not sure what exactly is wrong in leak detection on config tests
diff --cc distro/pkg/rpm/knot-resolver.spec
index cff04740b,0a7e2838f..565d47c01
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@@ -48,7 -48,7 +48,8 @@@ BuildRequires:  pkgconfig(libsystemd
  BuildRequires:  pkgconfig(libcap-ng)
  BuildRequires:  pkgconfig(libuv)
  BuildRequires:  pkgconfig(luajit) >= 2.0
+ BuildRequires:  jemalloc-devel
 +BuildRequires:  python3-devel
  
  Requires:       systemd
  Requires(post): systemd
diff --cc doc/build.rst
index c099b0efb,09b314dd6..30f1d77b4
--- a/doc/build.rst
+++ b/doc/build.rst
@@@ -118,8 -55,9 +119,9 @@@ Resolver
     "`lua-http`_", "``modules/http``", "HTTP/2 client/server for Lua."
     "`lua-cqueues`_", "some lua modules", ""
     "cmocka_", "``unit tests``", "Unit testing framework."
+    "dnsdist_", "``proxyv2 test``", "DNS proxy server"
     "Doxygen_", "``documentation``", "Generating API documentation."
 -   "Sphinx_ and sphinx_rtd_theme_", "``documentation``", "Building this
 +   "Sphinx_, sphinx-tabs_ and sphinx_rtd_theme_", "``documentation``", "Building this
     documentation."
     "Texinfo_", "``documentation``", "Generating this documentation in Info
     format."
@@@ -171,10 -118,8 +173,10 @@@ After that it is possible to build and 
  
  .. code-block:: bash
  
-    # build Knot Resolver
+    $ meson setup build_dir --prefix=/tmp/kr --default-library=static
     $ ninja -C build_dir
 +
 +   # install Knot Resolver into the previously configured '/tmp/kr' path
     $ ninja install -C build_dir
  
  At this point you can execute the newly installed binary using path ``/tmp/kr/sbin/kresd``.