nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerdns: fix ecdsa support

Browse Source 
add libressl, drop patch
neither openssl 1.0 (headers not found) nor openssl 1.1 (configuration
failed when trying to test constants) work, but libressl does
This commit is contained in:
ajs124 2019-01-12 13:17:12 +01:00
parent 6359e9baf0
commit 15c629334d
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/dns/powerdns/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2 , boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, libressl
, mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC
}: }:
@ -15,12 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip
libyamlcpp libsodium curl opendbx unixODBC botan2 libyamlcpp libsodium curl opendbx unixODBC botan2 libressl
];
patches = [
# checksum type not found, maybe a dependency is to old?
./skip-sha384-test.patch
]; ];
# nix destroy with-modules arguments, when using configureFlags # nix destroy with-modules arguments, when using configureFlags
@ -29,6 +24,7 @@ stdenv.mkDerivation rec {
"--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote" "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"
--with-sqlite3 --with-sqlite3
--with-socketdir=/var/lib/powerdns --with-socketdir=/var/lib/powerdns
--with-libcrypto=${libressl.dev}
--enable-libsodium --enable-libsodium
--enable-botan --enable-botan
--enable-tools --enable-tools

14
pkgs/servers/dns/powerdns/skip-sha384-test.patch
View File

@ -1,14 +0,0 @@
--- pdns-4.1.1.org/pdns/test-signers.cc 2018-02-17 11:43:15.953228279 +0000
+++ pdns-4.1.1/pdns/test-signers.cc 2018-02-17 11:44:21.089516393 +0000
@@ -212,11 +212,6 @@
BOOST_CHECK_EQUAL(ds2.getZoneRepresentation(), signer.dsSHA256);
}
- auto ds4 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA384);
- if (!signer.dsSHA384.empty()) {
- BOOST_CHECK_EQUAL(ds4.getZoneRepresentation(), signer.dsSHA384);
- }
-
auto signature = dcke->sign(message);
BOOST_CHECK(dcke->verify(message, signature));