From 999f3c2b9d61942e3fd07dfaa1d6c51d080351ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 28 Mar 2022 17:48:40 +0200
Subject: pdns: rename from powerdns

https://github.com/PowerDNS/pdns
https://repology.org/project/pdns/versions
---
 nixos/modules/services/networking/powerdns.nix |  4 +-
 pkgs/servers/dns/pdns/default.nix              | 59 ++++++++++++++++++++++++++
 pkgs/servers/dns/pdns/version.patch            | 13 ++++++
 pkgs/servers/dns/powerdns/default.nix          | 59 --------------------------
 pkgs/servers/dns/powerdns/version.patch        | 13 ------
 pkgs/top-level/aliases.nix                     |  1 +
 pkgs/top-level/all-packages.nix                |  2 +-
 7 files changed, 76 insertions(+), 75 deletions(-)
 create mode 100644 pkgs/servers/dns/pdns/default.nix
 create mode 100644 pkgs/servers/dns/pdns/version.patch
 delete mode 100644 pkgs/servers/dns/powerdns/default.nix
 delete mode 100644 pkgs/servers/dns/powerdns/version.patch

diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix
index 8cae61b8354..b035698456c 100644
--- a/nixos/modules/services/networking/powerdns.nix
+++ b/nixos/modules/services/networking/powerdns.nix
@@ -24,14 +24,14 @@ in {
 
   config = mkIf cfg.enable {
 
-    systemd.packages = [ pkgs.powerdns ];
+    systemd.packages = [ pkgs.pdns ];
 
     systemd.services.pdns = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ];
 
       serviceConfig = {
-        ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];
+        ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];
       };
     };
 
diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix
new file mode 100644
index 00000000000..ff057b48bd5
--- /dev/null
+++ b/pkgs/servers/dns/pdns/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, fetchurl, pkg-config, nixosTests
+, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
+, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb
+}:
+
+stdenv.mkDerivation rec {
+  pname = "powerdns";
+  version = "4.6.1";
+
+  src = fetchurl {
+    url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
+    sha256 = "sha256-eRKxSIfWKEUYX3zktH21gOqnuLiX3LHJVV3+D6xe+uM=";
+  };
+  # redact configure flags from version output to reduce closure size
+  patches = [ ./version.patch ];
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip
+    libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb
+  ];
+
+  configureFlags = [
+    "--disable-silent-rules"
+    "--enable-dns-over-tls"
+    "--enable-unit-tests"
+    "--enable-reproducible"
+    "--enable-tools"
+    "--enable-ixfrdist"
+    "--enable-systemd"
+    "--with-libsodium"
+    "--with-sqlite3"
+    "--with-libcrypto=${openssl.dev}"
+  ];
+
+  # nix destroy with-modules arguments, when using configureFlags
+  preConfigure = ''
+    configureFlagsArray+=(
+      "--with-modules="
+      "--with-dynmodules=bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe remote tinydns"
+    )
+  '';
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  passthru.tests = {
+    nixos = nixosTests.powerdns;
+  };
+
+  meta = with lib; {
+    description = "Authoritative DNS server";
+    homepage = "https://www.powerdns.com";
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ mic92 disassembler nickcao ];
+  };
+}
diff --git a/pkgs/servers/dns/pdns/version.patch b/pkgs/servers/dns/pdns/version.patch
new file mode 100644
index 00000000000..185d0702883
--- /dev/null
+++ b/pkgs/servers/dns/pdns/version.patch
@@ -0,0 +1,13 @@
+diff --git a/pdns/version.cc b/pdns/version.cc
+index d8f5d40..1368481 100644
+--- a/pdns/version.cc
++++ b/pdns/version.cc
+@@ -155,7 +155,7 @@ void showBuildConfiguration()
+ #ifdef PDNS_CONFIG_ARGS
+ #define double_escape(s) #s
+ #define escape_quotes(s) double_escape(s)
+-  g_log<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl;
++  g_log<<Logger::Warning<<"Configured with: "<<"redacted"<<endl;
+ #undef escape_quotes
+ #undef double_escape
+ #endif
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
deleted file mode 100644
index ff057b48bd5..00000000000
--- a/pkgs/servers/dns/powerdns/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, nixosTests
-, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
-, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb
-}:
-
-stdenv.mkDerivation rec {
-  pname = "powerdns";
-  version = "4.6.1";
-
-  src = fetchurl {
-    url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "sha256-eRKxSIfWKEUYX3zktH21gOqnuLiX3LHJVV3+D6xe+uM=";
-  };
-  # redact configure flags from version output to reduce closure size
-  patches = [ ./version.patch ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip
-    libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb
-  ];
-
-  configureFlags = [
-    "--disable-silent-rules"
-    "--enable-dns-over-tls"
-    "--enable-unit-tests"
-    "--enable-reproducible"
-    "--enable-tools"
-    "--enable-ixfrdist"
-    "--enable-systemd"
-    "--with-libsodium"
-    "--with-sqlite3"
-    "--with-libcrypto=${openssl.dev}"
-  ];
-
-  # nix destroy with-modules arguments, when using configureFlags
-  preConfigure = ''
-    configureFlagsArray+=(
-      "--with-modules="
-      "--with-dynmodules=bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe remote tinydns"
-    )
-  '';
-
-  enableParallelBuilding = true;
-  doCheck = true;
-
-  passthru.tests = {
-    nixos = nixosTests.powerdns;
-  };
-
-  meta = with lib; {
-    description = "Authoritative DNS server";
-    homepage = "https://www.powerdns.com";
-    platforms = platforms.unix;
-    broken = stdenv.isDarwin;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ mic92 disassembler nickcao ];
-  };
-}
diff --git a/pkgs/servers/dns/powerdns/version.patch b/pkgs/servers/dns/powerdns/version.patch
deleted file mode 100644
index 185d0702883..00000000000
--- a/pkgs/servers/dns/powerdns/version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pdns/version.cc b/pdns/version.cc
-index d8f5d40..1368481 100644
---- a/pdns/version.cc
-+++ b/pdns/version.cc
-@@ -155,7 +155,7 @@ void showBuildConfiguration()
- #ifdef PDNS_CONFIG_ARGS
- #define double_escape(s) #s
- #define escape_quotes(s) double_escape(s)
--  g_log<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl;
-+  g_log<<Logger::Warning<<"Configured with: "<<"redacted"<<endl;
- #undef escape_quotes
- #undef double_escape
- #endif
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a793fa063f9..a196d7d053f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -922,6 +922,7 @@ mapAliases ({
   polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22
   polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
   poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22
+  powerdns = pdns; # Added 2022-03-28
 
   # postgresql
   postgresql96 = postgresql_9_6;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad9eae28faa..d2244bc3801 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23226,7 +23226,7 @@ with pkgs;
 
   semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
 
-  powerdns = callPackage ../servers/dns/powerdns {
+  pdns = callPackage ../servers/dns/pdns {
     boost = boost172;
   };
 
-- 
cgit 1.4.1