From 1f3ce7010fe9b960257a61138821d11d437ff7b4 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Mon, 27 Aug 2018 10:18:34 +0300
Subject: drakfirewall: drop references to nonexistant mydsn, udhcpd, imap,    
           courier-imap-pop, bittorrent

---
 NEWS                        | 3 +++
 lib/network/drakfirewall.pm | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 71dc744..1017c83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- drakfirewall: drop references to nonexistant mydsn, udhcpd, imap,
+  courier-imap-pop, bittorrent
+
 2.34
 - iwlwifi-agn-ucode is renamed to iwlwifi-firmware (mga#22316)
 - updated translations
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index ac23dab..2f41cde 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -17,7 +17,7 @@ my @all_servers =
   },
   {
    name => N_("Domain Name Server"),
-   pkg => 'bind dnsmasq mydsn',
+   pkg => 'bind dnsmasq',
    ports => '53/tcp 53/udp',
   },
   {
@@ -32,7 +32,7 @@ my @all_servers =
   },
   {
    name => N_("DHCP Server"),
-   pkg => 'dhcp-server udhcpd',
+   pkg => 'dhcp-server',
    ports => '67/udp 68/udp',
    hide => 1,
   },
@@ -43,7 +43,6 @@ my @all_servers =
   },
   {
    name => N_("POP and IMAP Server"),
-   pkg => 'imap courier-imap-pop',
    ports => '109/tcp 110/tcp 143/tcp 993/tcp 995/tcp',
   },
   {
@@ -110,7 +109,7 @@ my @all_servers =
    name => N_("BitTorrent"),
    ports => '6881:6999/tcp 6881:6999/udp',
    hide => 1,
-   pkg => 'bittorrent deluge ktorrent vuze rtorrent transmission-common',
+   pkg => 'deluge ktorrent vuze rtorrent transmission-common',
   },
   {
    name => N_("KDEConnect"),
-- 
cgit v1.2.1