Ein Paar ganz unnoetige Scripts geloescht.

Einen String im Installer verkuerzt.
Einen Symlink der libnewt* vergessen.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@546 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt
index f6b16481c1fdd8d43d2f758d9c6ad5061ebf0b6f..e8361544dee3634864f0426c71ad62c40062583f 100644 (file)
--- a/config/rootfiles/common/newt
+++ b/config/rootfiles/common/newt
@@ -2,6 +2,7 @@
 #usr/include/newt.h
 #usr/lib/libnewt.a
 usr/lib/libnewt.so
+usr/lib/libnewt.so.0.51
 usr/lib/libnewt.so.0.51.6
 #usr/lib/python2.4/site-packages/_snackmodule.so
 #usr/lib/python2.4/site-packages/snack.py

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index c1f6e9e2b50b1135297392244fd91bb679de5ddb..37204250412258eb85c351880ea9670b03c3d56b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -55,7 +55,6 @@
 * cdrtools-2.01
 * cftp-0.12
 * clamav-0.90.2
-* clamav-0.90.2
 * coreutils-5.96
 * cpio-2.6
 * cups-1.2.2
@@ -83,7 +82,6 @@
 * fcpci-suse93-3.11-07
 * fcron-3.0.1
 * fetchmail-6.3.4
-* ffmpeg-20051126
 * file-4.17
 * findutils-4.2.27
 * flex-2.5.33
@@ -155,7 +153,6 @@
 * linuxigd-0.95
 * logrotate-3.7.1
 * logwatch_7.3.1
-* lynx2.8.5
 * lzo-2.02
 * m4-1.4.4
 * mailx-12.0
@@ -169,7 +166,6 @@
 * mktemp-1.5
 * mldonkey-2.7.7
 * module-init-tools-3.2.2
-* mpeg2dec-20050802
 * mpg123-0.59r
 * mtd-CVS-20070507
 * mtools-3.9.10
@@ -185,7 +181,6 @@
 * nmap-4.03
 * noip_updater_v1.6
 * ntfs-3g-1.0
-* ntop-3.2
 * ntp-4.2.2
 * ocaml-3.09.2
 * oinkmaster-2.0
@@ -206,10 +201,8 @@
 * postfix-2.2.11
 * ppp-2.4.4
 * pptp-1.7.1
-* procmail-3.22
 * procps-3.2.6
 * psmisc-22.2
-* razor-agents-2.81
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19
@@ -253,14 +246,10 @@
 * util-linux-2.12r
 * vim-7.0
 * vlan.1.9
-* vlc-0.8.5
 * web-cyradm-0.5.5-CVS-for-ipfire
 * wget-1.10.2
 * whatmask-1.2
 * wireless_tools.28
-* wput-0.6
-* xinetd-2.3.14
 * xmbmon205
-* xvidcore-1.1.0
 * zaptel-1.4.0
 * zlib-1.2.3

diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c
index acb8b0b92bdfc0c196a19c74443f79a66ff4f159..6ad668dc052e80519a4595b48747ef27bb0eeeab 100644 (file)
--- a/langs/de/install/lang_de.c
+++ b/langs/de/install/lang_de.c
@@ -66,7 +66,7 @@ char *de_tr[] = {
 /* TR_CONGRATULATIONS */
 "Herzlichen Glückwunsch!",
 /* TR_CONGRATULATIONS_LONG */
-"%s wurde erfolgreich installiert. Entfernen Sie bitte alle Disketten oder CDs aus dem Computer. Nun wird das Setup-Programm gestartet, in dem Sie ISDN, Netzwerkkarten und die Systempasswörter konfigurieren können. Wenn dies fertiggestellt ist, rufen Sie in Ihrem Webbrowser die Box mit http://%s:81 oder https://%s:444 (oder welchen Namen Sie Ihrem %s auch immer gegeben haben) auf und konfigurieren die Wählverbindung und (falls nötig) die Fernwartung. Denken Sie daran, für den %s-'dial'-Benutzer ein Passwort zu vergeben, falls auch andere Benutzer als der %s-'admin' die Internet-Einwahlverbindung kontrollieren können sollen.",
+"%s wurde erfolgreich installiert. Entfernen Sie bitte alle eventuellen CDs aus dem Computer. Nun wird das Setup-Programm gestartet, in dem Sie ISDN, Netzwerkkarten und die Systempasswörter konfigurieren können. Wenn dies fertiggestellt ist, rufen Sie in Ihrem Webbrowser die Box mit https://%s:444 (oder welchen Namen Sie Ihrem %s auch immer gegeben haben) auf und konfigurieren die Wählverbindung und (falls nötig) die Fernwartung.",
 /* TR_CONTINUE_NO_SWAP */
 "Ihre Festplatte ist sehr klein, aber sie können ohne Auslagerungsdatei weitermachen. (Mit Vorsicht benutzen).",
 /* TR_CURRENT_CONFIG */

diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c
index fdbac6baaf91c8a11d56d0947a68d219f00bc8b0..d9d9a8dd3d271de2800be997f37a1e5b427bdf3b 100644 (file)
--- a/langs/en/install/lang_en.c
+++ b/langs/en/install/lang_en.c
@@ -62,7 +62,7 @@ char *en_tr[] = {
 /* TR_CONGRATULATIONS */
 "Congratulations!",
 /* TR_CONGRATULATIONS_LONG */
-"%s was successfully installed. Please remove any floppy disks or CDROMs in the computer. If your system fails to boot properly, please try booting from a DOS diskette and running 'FDISK /MBR' to re-create the Master Boot Record. Setup will now run where you may configure ISDN, network cards, and the system passwords. After Setup has been completed, you should point your web browser at http://%s:81 or https://%s:444 (or whatever you name your %s), and configure dialup networking (if required) and remote access. Remember to set a password for the %s 'dial' user, if you wish non %s 'admin' users to be able to control the link.",
+"%s was successfully installed. Please remove any CDROMs in the computer. Setup will now run where you may configure ISDN, network cards, and the system passwords. After Setup has been completed, you should point your web browser at https://%s:444 (or whatever you name your %s), and configure dialup networking (if required) and remote access.",
 /* TR_CONTINUE_NO_SWAP */
 "Your harddisk is very small, but you can continue without any swap. (Use with caution).",
 /* TR_CURRENT_CONFIG */

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 85c021b0a23146a5571e196bf1b7be85d317dde9..794f027fe2124381001ffac0833fac6f7fde2283 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -571,7 +571,7 @@ int main(int argc, char *argv[])
 
        if (!unattended) {
                sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
-                               NAME, SNAME, SNAME, NAME, NAME, NAME);
+                               NAME, SNAME, NAME);
                newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
        }
                 

diff --git a/tools/perfTest.sh b/tools/perfTest.sh
deleted file mode 100644 (file)
index 12e5f99..0000000
--- a/tools/perfTest.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-#
-############################################################################
-#                                                                          #
-# This file is part of the IPCop Firewall.                                 #
-#                                                                          #
-# IPCop is free software; you can redistribute it and/or modify            #
-# it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPCop is distributed in the hope that it will be useful,                 #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# GNU General Public License for more details.                             #
-#                                                                          #
-# You should have received a copy of the GNU General Public License        #
-# along with IPCop; if not, write to the Free Software                     #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2005 Mark Wormgoor <mark@wormgoor.com>.                    #
-#                                                                          #
-############################################################################
-#
-# $Id: perfTest.sh,v 1.1.2.1 2005/01/26 19:43:36 riddles Exp $
-#
-# This script will do a get request for all links on an IPCop box.
-# You can time this using:
-#      time ./perfTest.sh
-#
-# This will give you a basic idea of the speed of your IPCop machine
-# and will make it possible for you to test new updates for performance.
-# With just network overhead on a sufficiently fast machine, expect 
-# something around 5 seconds for the entire test.
-#
-## Basic settings
-CGI_HOST=$1
-CGI_PORT=444
-CGI_URL="https://$CGI_HOST:$CGI_PORT/cgi-bin"
-USER=admin
-PASS=ipfire
-CMD="wget -q -O /dev/null --http-user=$USER --http-passwd=$PASS"
-
-doTest() {
-       $CMD $CGI_URL/aliases.cgi
-       $CMD $CGI_URL/backup.cgi
-       $CMD $CGI_URL/changepw.cgi
-       $CMD $CGI_URL/connections.cgi
-       $CMD $CGI_URL/credits.cgi
-       $CMD $CGI_URL/ddns.cgi
-       $CMD $CGI_URL/dhcp.cgi
-       $CMD $CGI_URL/dial.cgi
-       $CMD $CGI_URL/dmzholes.cgi
-       $CMD $CGI_URL/graphs.cgi
-       $CMD $CGI_URL/gui.cgi
-       $CMD $CGI_URL/hosts.cgi
-       $CMD $CGI_URL/ids.cgi
-       $CMD $CGI_URL/index.cgi
-       $CMD $CGI_URL/ipinfo.cgi
-       $CMD $CGI_URL/modem.cgi
-       $CMD $CGI_URL/netstatus.cgi
-       $CMD $CGI_URL/portfw.cgi
-       $CMD $CGI_URL/pppsetup.cgi
-       $CMD $CGI_URL/proxy.cgi
-       $CMD $CGI_URL/proxygraphs.cgi
-       $CMD $CGI_URL/remote.cgi
-       $CMD $CGI_URL/shaping.cgi
-       $CMD $CGI_URL/shutdown.cgi
-       $CMD $CGI_URL/status.cgi
-       $CMD $CGI_URL/time.cgi
-       $CMD $CGI_URL/updates.cgi
-       $CMD $CGI_URL/upload.cgi
-       $CMD $CGI_URL/vpnmain.cgi
-       $CMD $CGI_URL/wireless.cgi
-       $CMD $CGI_URL/xtaccess.cgi
-       $CMD $CGI_URL/logs.cgi/config.dat
-       $CMD $CGI_URL/logs.cgi/firewalllog.dat
-       $CMD $CGI_URL/logs.cgi/ids.dat
-       $CMD $CGI_URL/logs.cgi/log.dat
-       $CMD $CGI_URL/logs.cgi/proxylog.dat
-       $CMD $CGI_URL/logs.cgi/summary.dat
-}
-
-doTest

diff --git a/tools/version-check.sh b/tools/version-check.sh
deleted file mode 100644 (file)
index 4f92f42..0000000
--- a/tools/version-check.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# Einfaches Skript zum Auflisten der Versionsnummern wichtiger Werkzeuge
-
-echo "BENOETIGT - VORHANDEN"
-echo -n "Bash-2.05a - " 
-bash --version | head -n1 | cut -d" " -f2-4
-
-echo -n "Binutils-2.12 - "
-echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-4
-
-echo -n "Bzip2-1.0.2 - "
-bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f1,6-
-
-echo -n "Coreutils-5.0 - "
-echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
-
-echo -n "Diffutils-2.8 - "
-diff --version | head -n1
-
-echo -n "Findutils-4.1.20 - "
-find --version | head -n1
-
-echo -n "Gawk-3.0 - "
-gawk --version | head -n1
-
-echo -n "Gcc-2.95.3 - "
-gcc --version | head -n1
-
-echo -n "Glibc-2.2.5 - "
-/lib/libc.so.6 | head -n1 | cut -d" " -f1-7
-
-echo -n "Grep-2.5 - "
-grep --version | head -n1
-
-echo -n "Gzip-1.2.4 - "
-gzip --version | head -n1
-
-echo -n "Linux-Kernel-2.6 - "
-cat /proc/version | head -n1 | cut -d" " -f1-3,5-7
-
-echo -n "Make-3.79.1 - "
-make --version | head -n1
-
-echo -n "Patch-2.5.4 - "
-patch --version | head -n1
-
-echo -n "Sed-3.0.2 - "
-sed --version | head -n1
-
-echo -n "Tar-1.14 - "
-tar --version | head -n1