From ce0b9e6999e020c1c966a993edb3b8376953b699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust@mageia.org>
Date: Tue, 28 Mar 2017 09:46:47 +0200
Subject: Remove some packages no more available in mageia

---
 NEWS                        |  1 +
 lib/network/drakfirewall.pm | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index fa781a9..773f753 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 - drakfirewall
   o adapt to new samba package name (mga#20584)
+  o Remove some packages no more available in mageia (mga#20584)
 2.31
 - draksambashare: 
   o updated require samba instead of samba-server (mga#17121)
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 26c50a5..76932ea 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -12,7 +12,7 @@ my @all_servers =
 (
   {
    name => N_("Web Server"),
-   pkg => 'apache apache-mod_perl boa lighttpd thttpd',
+   pkg => 'apache apache-mod_perl lighttpd',
    ports => '80/tcp 443/tcp',
   },
   {
@@ -27,7 +27,7 @@ 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',
   },
   {
@@ -38,7 +38,7 @@ my @all_servers =
   },
   {
    name => N_("Mail Server"),
-   pkg => 'sendmail postfix qmail exim',
+   pkg => 'sendmail postfix',
    ports => '25/tcp 465/tcp 587/tcp',
   },
   {
@@ -48,13 +48,13 @@ my @all_servers =
   },
   {
    name => N_("Telnet server"),
-   pkg => 'telnet-server-krb5',
+   pkg => '',
    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()) },
@@ -68,7 +68,7 @@ my @all_servers =
   },
   {
    name => N_("Bacula backup"),
-   pkg => 'bacula-fd bacula-sd bacula-dir-common',
+   pkg => 'bacula-fd bacula-sd',
    ports => '9101:9103/tcp',
    hide => 1,
   },
@@ -86,13 +86,13 @@ my @all_servers =
   },
   {
    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 => 'postgresql8.4 postgresql8.6',
    ports => '5432/tcp 5432/udp',
    hide => 1,
   },
@@ -110,11 +110,11 @@ my @all_servers =
    name => N_("BitTorrent"),
    ports => '6881:6999/tcp 6881:6999/udp',
    hide => 1,
-   pkg => 'bittorrent deluge ktorrent transmission vuze rtorrent ctorrent',
+   pkg => 'bittorrent deluge ktorrent vuze rtorrent',
   },
   {
    name => N_("Windows Mobile device synchronization"),
-   pkg => 'synce-hal',
+   pkg => '',
    ports => '990/tcp 999/tcp 5678/tcp 5679/udp 26675/tcp',
    hide => 1,
   },
-- 
cgit v1.2.1