mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-29 08:38:18 +03:00
Merge pull request #266299 from wahjava/update-unbound
unbound: 1.18.0 -> 1.19.0
This commit is contained in:
commit
7623b1c0fd
@ -106,8 +106,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||||||
{
|
{
|
||||||
name = ".";
|
name = ".";
|
||||||
forward-addr = [
|
forward-addr = [
|
||||||
(lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address
|
(lib.head nodes.authoritative.networking.interfaces.eth1.ipv6.addresses).address
|
||||||
(lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address
|
(lib.head nodes.authoritative.networking.interfaces.eth1.ipv4.addresses).address
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@ -168,8 +168,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||||||
"unbound-extra1.conf".text = ''
|
"unbound-extra1.conf".text = ''
|
||||||
forward-zone:
|
forward-zone:
|
||||||
name: "example.local."
|
name: "example.local."
|
||||||
forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}
|
forward-addr: ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}
|
||||||
forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}
|
forward-addr: ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}
|
||||||
'';
|
'';
|
||||||
"unbound-extra2.conf".text = ''
|
"unbound-extra2.conf".text = ''
|
||||||
auth-zone:
|
auth-zone:
|
||||||
@ -187,8 +187,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||||||
client = { lib, nodes, ... }: {
|
client = { lib, nodes, ... }: {
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
networking.nameservers = [
|
networking.nameservers = [
|
||||||
(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address
|
(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address
|
||||||
(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address
|
(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address
|
||||||
];
|
];
|
||||||
networking.interfaces.eth1.ipv4.addresses = [
|
networking.interfaces.eth1.ipv4.addresses = [
|
||||||
{ address = "192.168.0.10"; prefixLength = 24; }
|
{ address = "192.168.0.10"; prefixLength = 24; }
|
||||||
@ -276,7 +276,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||||||
resolver.wait_for_unit("multi-user.target")
|
resolver.wait_for_unit("multi-user.target")
|
||||||
|
|
||||||
with subtest("client should be able to query the resolver"):
|
with subtest("client should be able to query the resolver"):
|
||||||
test(client, ["${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)
|
test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)
|
||||||
|
|
||||||
# discard the client we do not need anymore
|
# discard the client we do not need anymore
|
||||||
client.shutdown()
|
client.shutdown()
|
||||||
@ -298,7 +298,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||||||
).strip()
|
).strip()
|
||||||
|
|
||||||
# Thank you black! Can't really break this line into a readable version.
|
# Thank you black! Can't really break this line into a readable version.
|
||||||
expected = "example.local. IN forward ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"
|
expected = "example.local. IN forward ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"
|
||||||
assert out == expected, f"Expected `{expected}` but got `{out}` instead."
|
assert out == expected, f"Expected `{expected}` but got `{out}` instead."
|
||||||
local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards")
|
local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards")
|
||||||
|
|
||||||
|
@ -47,24 +47,15 @@
|
|||||||
, gnutls
|
, gnutls
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "unbound";
|
pname = "unbound";
|
||||||
version = "1.18.0";
|
version = "1.19.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz";
|
url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz";
|
||||||
hash = "sha256-PalUkKhc/2Qg8m+uC4Skn1ES3xvxt/w0+HJPAggstxI=";
|
hash = "sha256-qXUyRohUxhwt5IykFw3oVP07yVyAQ7sM+w/iZgWWZiQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Backport: fix libunbound with nettle.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/NLnetLabs/unbound/commit/654a7eab62cbd1844d483cc4a0f2cf2fbcbaf00a.patch";
|
|
||||||
excludes = [ "doc/Changelog" ];
|
|
||||||
hash = "sha256-n3FCeZESFrrn6Wcf28Hb8WZs1eMHWjbsf2WCFOXU3lI=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
|
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper pkg-config ]
|
nativeBuildInputs = [ makeWrapper pkg-config ]
|
||||||
@ -157,7 +148,7 @@ stdenv.mkDerivation rec {
|
|||||||
+ ''substituteInPlace "$lib/lib/libunbound.la" ''
|
+ ''substituteInPlace "$lib/lib/libunbound.la" ''
|
||||||
+ lib.concatMapStrings
|
+ lib.concatMapStrings
|
||||||
(pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
|
(pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
|
||||||
(builtins.filter (p: p != null) buildInputs);
|
(builtins.filter (p: p != null) finalAttrs.buildInputs);
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit gnutls;
|
inherit gnutls;
|
||||||
@ -172,4 +163,4 @@ stdenv.mkDerivation rec {
|
|||||||
maintainers = with maintainers; [ ajs124 ];
|
maintainers = with maintainers; [ ajs124 ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user