- do not warn about "servers which open ports on outside by default"

  (the list of servers is not maintained, and the policy for those servers has changed)

4 files changed, 2 insertions, 131 deletions

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f6748a8b1..a1bf93f74 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not warn about "servers which open ports on outside by default"
+  (the list of servers is not maintained, and the policy for those servers has changed)
 - use a file selector in text mode too
 - include mke2fs.conf from e2fsprogs-1.41.3-3mdb
 - media management:
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index a183312e6..8edef5c9c 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -575,29 +575,6 @@ sub unselectMostPackages {
     select_default_packages($o);
 }
 
-sub warnAboutNaughtyServers {
-    my ($o) = @_;
-    my @naughtyServers = install::pkgs::naughtyServers($o->{packages}) or return 1;
-    my $r = $o->ask_from_list_('', 
-formatAlaTeX(
-             #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
-             N("You have selected the following server(s): %s
-
-
-These servers are activated by default. They do not have any known security
-issues, but some new ones could be found. In that case, you must make sure
-to upgrade as soon as possible.
-
-
-Do you really want to install these servers?
-", join(", ", @naughtyServers))), [ N_("Yes"), N_("No") ], 'Yes') or return;
-    if ($r ne 'Yes') {
-	log::l("unselecting naughty servers: " . join(' ', @naughtyServers));
-	install::pkgs::unselectPackage($o->{packages}, install::pkgs::packageByName($o->{packages}, $_)) foreach @naughtyServers;
-    }
-    1;
-}
-
 sub warnAboutRemovedPackages {
     my ($o, $packages) = @_;
     my @removedPackages = keys %{$packages->{state}{ask_remove} || {}} or return;
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index d05200581..0be5aa473 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -1072,111 +1072,4 @@ sub selected_leaves {
     [ map { $_->name } grep { ! exists $required_ids{$_->id} } @l ];    
 }
 
-sub naughtyServers_list {
-    my ($quiet) = @_;
-
-    my @_old_81 = qw(
-freeswan
-);
-    my @_old_82 = qw(
-vnc-server
-postgresql-server
-);
-
-    my @_old_92 = qw(
-postfix ypbind bind ibod
-);
-
-    my @_removed_92 = qw(
-mcserv
-samba
-lpr
-);
-
-    my @_moved_to_contrib_92 = qw(
-boa
-LPRng
-wu-ftpd
-am-utils
-);
-
-    my @new_80 = qw(
-jabber
-am-utils
-boa
-cups
-drakxtools-http
-finger-server
-imap
-leafnode
-ntp
-openssh-server
-pidentd
-proftpd
-rwall
-squid
-webmin
-wu-ftpd
-);
-
-    my @new_81 = qw(
-ftp-server-krb5
-telnet-server-krb5
-ypserv
-);
-
-    my @new_82 = qw(
-LPRng
-inn
-netatalk
-nfs-utils
-rusers-server
-samba-swat
-tftp-server
-ucd-snmp
-);
-
-    my @new_92 = qw(
-clusternfs
-gkrellm-server
-mon
-net-snmp
-openldap-servers
-samba-server
-saned
-vsftpd
-);
-
-    my @new_2006 = qw(
-apache-conf
-bpalogin
-cfengine-cfservd
-freeradius
-mDNSResponder
-openslp
-pxe
-routed
-sendmail
-spamassassin-spamd
-);
-
-    my @not_warned = qw(
-lisa
-nfs-utils-clients
-portmap
-howl
-); # X server
-
-    (@new_80, @new_81, @new_82, @new_92, @new_2006, if_(!$quiet, @not_warned));
-}
-
-sub naughtyServers {
-    my ($packages) = @_;
-
-    grep {
-	my $p = packageByName($packages, $_);
-	$p && $p->flag_selected;
-    } naughtyServers_list('quiet');
-}
-
 1;
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index ffcc4b03b..cea3c06e2 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -443,7 +443,6 @@ sub choosePackages {
     $o->choosePackagesTree($o->{packages}) or goto chooseGroups if $individual;
 
     install::any::warnAboutRemovedPackages($o, $o->{packages});
-    install::any::warnAboutNaughtyServers($o) or goto chooseGroups if !$o->{isUpgrade};
 }
 
 sub choosePackagesTree {