1 files changed, 38 insertions, 16 deletions
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 3a808c2..ed7200e 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -12,12 +12,12 @@ my @all_servers =
 (
   {
    name => N_("Web Server"),
-   pkg => 'apache apache-mod_perl boa lighttpd thttpd',
+   pkg => 'apache apache-mod_perl lighttpd nginx',
    ports => '80/tcp 443/tcp',
   },
   {
    name => N_("Domain Name Server"),
-   pkg => 'bind dnsmasq mydsn',
+   pkg => 'bind dnsmasq',
    ports => '53/tcp 53/udp',
   },
   {
@@ -27,34 +27,33 @@ my @all_servers =
   },
   {
    name => N_("FTP server"),
-   pkg => 'ftp-server-krb5 wu-ftpd proftpd pure-ftpd',
+   pkg => 'proftpd pure-ftpd',
    ports => '20/tcp 21/tcp',
   },
   {
    name => N_("DHCP Server"),
-   pkg => 'dhcp-server udhcpd',
+   pkg => 'dhcp-server',
    ports => '67/udp 68/udp',
    hide => 1,
   },
   {
    name => N_("Mail Server"),
-   pkg => 'sendmail postfix qmail exim',
-   ports => '25/tcp 465/tcp',
+   pkg => 'sendmail postfix',
+   ports => '25/tcp 465/tcp 587/tcp',
   },
   {
    name => N_("POP and IMAP Server"),
-   pkg => 'imap courier-imap-pop',
    ports => '109/tcp 110/tcp 143/tcp 993/tcp 995/tcp',
   },
   {
    name => N_("Telnet server"),
-   pkg => 'telnet-server-krb5',
+   pkg => 'netkit-telnet-server',
    ports => '23/tcp',
    hide => 1,
   },
   {
    name => N_("NFS Server"),
-   pkg => 'nfs-utils nfs-utils-clients',
+   pkg => 'nfs-utils',
    ports => '111/tcp 111/udp 2049/tcp 2049/udp ' . network::nfs::list_nfs_ports(),
    hide => 1,
    prepare => sub { network::nfs::write_nfs_ports(network::nfs::read_nfs_ports()) },
@@ -62,13 +61,13 @@ my @all_servers =
   },
   {
    name => N_("Windows Files Sharing (SMB)"),
-   pkg => 'samba-server',
+   pkg => 'samba',
    ports => '137/tcp 137/udp 138/tcp 138/udp 139/tcp 139/udp 445/tcp 445/udp 1024:1100/tcp 1024:1100/udp',
    hide => 1,
   },
   {
    name => N_("Bacula backup"),
-   pkg => 'bacula-fd bacula-sd bacula-dir-common',
+   pkg => 'bacula-fd bacula-sd',
    ports => '9101:9103/tcp',
    hide => 1,
   },
@@ -85,14 +84,20 @@ my @all_servers =
    hide => 1,
   },
   {
+   name => N_("SANE server"),
+   pkg => 'saned',
+   ports => '6566/tcp',
+   hide => 1,
+  },
+  {
    name => N_("MySQL server"),
-   pkg => 'mysql',
+   pkg => 'mariadb',
    ports => '3306/tcp 3306/udp',
    hide => 1,
   },
   {
    name => N_("PostgreSQL server"),
-   pkg => 'postgresql8.2 postgresql8.3',
+   pkg => 'postgresql11 postgresql13',
    ports => '5432/tcp 5432/udp',
    hide => 1,
   },
@@ -107,14 +112,31 @@ my @all_servers =
    pkg => 'avahi cups openslp',
   },
   {
+   name => N_("Network printer/scanner autodiscovery"),
+   # Canon scanner autodiscovery detects responses on UDP port 8612
+   ports => '8612/udp',
+   pkg => 'sane-backends',
+  },
+  {
    name => N_("BitTorrent"),
-   ports => '6881:6999/tcp',
+   ports => '6881:6999/tcp 6881:6999/udp',
+   hide => 1,
+   pkg => 'deluge ktorrent rtorrent transmission-common',
+  },
+  {
+   name => N_("KDEConnect"),
+   ports => '1714:1764/udp 1714:1764/tcp',
+   hide => 1,
+   pkg => 'kdeconnect-kde',
+  },
+  {
+   name => N_("Ident server"),
+   ports => '113/tcp',
    hide => 1,
-   pkg => 'bittorrent deluge ktorrent transmission vuze rtorrent ctorrent',
+   pkg => 'oidentd',
   },
   {
    name => N_("Windows Mobile device synchronization"),
-   pkg => 'synce-hal',
    ports => '990/tcp 999/tcp 5678/tcp 5679/udp 26675/tcp',
    hide => 1,
   },