Merge branch 'master' into manager

6 files changed, 10 insertions, 3 deletions

diff --git a/distro/pkg/arch/PKGBUILD b/distro/pkg/arch/PKGBUILD
index 967ad7ca..7eea556e 100644
--- a/distro/pkg/arch/PKGBUILD
+++ b/distro/pkg/arch/PKGBUILD
@@ -20,6 +20,7 @@ depends=(
     'systemd'
     'libcap-ng'
     'libnghttp2'
+    'jemalloc'
 )
 makedepends=(
     'cmocka'
@@ -47,6 +48,7 @@ build() {
         -D systemd_files=enabled \
         -D client=enabled \
         -D install_kresd_conf=enabled \
+        -D malloc=jemalloc \
         -D unit_tests=enabled
     ninja -C build
 }
diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index be545bb7..c4d1edb2 100644
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -17,6 +17,7 @@ Build-Depends:
  libsystemd-dev (>= 227) [linux-any],
  libcap-ng-dev,
  libuv1-dev,
+ libjemalloc-dev,
  luajit,
  pkg-config,
  meson (>= 0.49),
diff --git a/distro/pkg/deb/copyright b/distro/pkg/deb/copyright
index dc2c9bbb..96e23ca2 100644
--- a/distro/pkg/deb/copyright
+++ b/distro/pkg/deb/copyright
@@ -3,7 +3,7 @@ Upstream-Name: knot-resolver
 Source: https://www.knot-resolver.cz/
 
 Files: *
-Copyright: 2015-2018 CZ.NIC
+Copyright: CZ.NIC
 License: GPL-3.0+
 
 Files: contrib/ccan/asprintf/*
diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 9864d5de..787dad99 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -34,6 +34,7 @@ override_dh_auto_build:
 		-Droot_hints=/usr/share/dns/root.hints \
 		-Dinstall_kresd_conf=enabled \
 		-Dunit_tests=enabled \
+		-Dmalloc=jemalloc \
 		-Dc_args="$${CFLAGS}" \
 		-Dc_link_args="$${LDFLAGS}"
 	ninja -v -C build_deb
diff --git a/distro/pkg/nix/default.nix b/distro/pkg/nix/default.nix
index af42fa80..16c66d05 100644
--- a/distro/pkg/nix/default.nix
+++ b/distro/pkg/nix/default.nix
@@ -3,7 +3,7 @@
 , runCommand, pkg-config, meson, ninja, makeWrapper
 # build+runtime deps.
 , knot-dns, luajitPackages, libuv, gnutls, lmdb
-, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
+, jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
 # test-only deps.
 , cmocka, which, cacert
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -56,7 +56,7 @@ unwrapped = stdenv.mkDerivation rec {
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
   buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
     ++ optionals stdenv.isLinux [ systemd libcap_ng ]
-    ++ [ nghttp2 ]
+    ++ [ jemalloc nghttp2 ]
     ## optional dependencies; TODO: dnstap
     ;
 
@@ -64,6 +64,7 @@ unwrapped = stdenv.mkDerivation rec {
     "-Dkeyfile_default=${dns-root-data}/root.ds"
     "-Droot_hints=${dns-root-data}/root.hints"
     "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/
+    "-Dmalloc=jemalloc"
     "--default-library=static" # not used by anyone
   ]
   ++ optional doInstallCheck "-Dunit_tests=enabled"
diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index cff04740..565d47c0 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -48,6 +48,7 @@ BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libcap-ng)
 BuildRequires:  pkgconfig(libuv)
 BuildRequires:  pkgconfig(luajit) >= 2.0
+BuildRequires:  jemalloc-devel
 BuildRequires:  python3-devel
 
 Requires:       systemd
@@ -183,6 +184,7 @@ CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
     -Dkeyfile_default="%{_sharedstatedir}/knot-resolver/root.keys" \
     -Dinstall_root_keys=enabled \
     -Dinstall_kresd_conf=enabled \
+    -Dmalloc=jemalloc \
     --buildtype=plain \
     --prefix="%{_prefix}" \
     --sbindir="%{_sbindir}" \