Cleanup old packages.

diff --git a/src/data.sh b/src/data.sh
index 02fc721..983ff86 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -80,10 +80,13 @@ xinetd-cn xinetd
 # We want to remove these packages, used in remove_bloat()
 # nice name            packages to remove
 bloats='
+apache         apache apache-cn
 gobjc gpc gcj gij chill g77            gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij chill g77
 nessus         libnessus2 nessus-cn
+ntop           ntop ntop-cn
 prelude piwi   piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn prelude-manager
 snort          snort snort-cn snort-central-cn
+squid          squid squid-cn
 stari CN paketi        autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn razor-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn sys-mon-cn tcpdump-cn telnet-ssl-cn telnetd-ssl unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
 usbmgr         usbmgr
 '
@@ -104,7 +107,6 @@ mysql-cn mysql-client mysql-server mysql-common
 oidentd-cn oidentd
 samba-cn samba smbclient
 spamassassin-cn spamassassin spamc razor dcc-client
-squid-cn squid
 squirrelmail-cn squirrelmail squirrelmail-locales
 vsftpd-cn vsftpd
 webalizer-cn webalizer
@@ -133,7 +135,6 @@ services_to_check='
 amavisd-cn             amavis          amavisd [(]master[)]                    Amavis
 aosi-aai               aosi            /usr/sbin/aosi                          AOSI
 apache2-cn             www-data        /usr/sbin/apache2                       Apache2
-apache-cn              www-data        /usr/sbin/apache                        Apache
 bind9-cn               bind            /usr/sbin/named                         Bind
 clamav-cn              clamav          /usr/bin/freshclam                      ClamAV update
 clamav-cn              clamav          /usr/sbin/clamd                         ClamAV
@@ -143,7 +144,6 @@ mailman-cn          list            /usr/lib/mailman/bin/mailmanctl         Mailman
 monit-cn               root            /usr/sbin/monit                         Monit
 munin-cn               root            /usr/sbin/munin-node                    Munin
 mysql-cn               mysql           /usr/sbin/mysqld                        MySQL
-ntop-cn                        ntop            /usr/sbin/ntop                          Ntop
 ntp-cn                 ntp             /usr/sbin/ntpd                          NTP
 oidentd-cn             oident          /usr/sbin/oidentd                       oidentd
 openldap-aai           openldap        /usr/sbin/slapd                         OpenLDAP
@@ -153,8 +153,6 @@ postfix-cn          root            /usr/lib/postfix/master                 Postfix
 postfix-cn             root            /usr/sbin/saslauthd                     SASL authentication
 postgresql             postgres        /usr/lib/postgresql/7.4/bin/postmaster  PostgreSQL
 samba-cn               root            /usr/sbin/smbd                          Samba
-snort-cn               snort           /usr/sbin/snort                         Snort
-squid-cn               root            /usr/sbin/squid                         Squid
 vsftpd-cn              root            /usr/sbin/vsftpd                        VSFTPD
 xinetd-cn              root            /usr/sbin/xinetd                        xinetd
 '