mtools enfernt.

Keyserver des Pakfire geaendert.
ISDN aus dem Setup-Menue ausgebaut.

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

diff --git a/config/rootfiles/common/mtools b/config/rootfiles/common/mtools
deleted file mode 100644 (file)
index 680e118..0000000
--- a/config/rootfiles/common/mtools
+++ /dev/null
@@ -1,61 +0,0 @@
-#usr/bin/amuFormat.sh
-usr/bin/lz
-usr/bin/mattrib
-usr/bin/mbadblocks
-usr/bin/mcat
-usr/bin/mcd
-usr/bin/mcheck
-usr/bin/mclasserase
-usr/bin/mcomp
-usr/bin/mcopy
-usr/bin/mdel
-usr/bin/mdeltree
-usr/bin/mdir
-usr/bin/mdu
-usr/bin/mformat
-usr/bin/minfo
-usr/bin/mkmanifest
-usr/bin/mlabel
-usr/bin/mmd
-usr/bin/mmount
-usr/bin/mmove
-usr/bin/mpartition
-usr/bin/mrd
-usr/bin/mren
-usr/bin/mshowfat
-usr/bin/mtools
-usr/bin/mtoolstest
-usr/bin/mtype
-usr/bin/mxtar
-usr/bin/mzip
-usr/bin/tgz
-usr/bin/uz
-#usr/info/mtools.info
-#usr/man/man1/floppyd.1
-#usr/man/man1/floppyd_installtest.1
-#usr/man/man1/mattrib.1
-#usr/man/man1/mbadblocks.1
-#usr/man/man1/mcat.1
-#usr/man/man1/mcd.1
-#usr/man/man1/mclasserase.1
-#usr/man/man1/mcopy.1
-#usr/man/man1/mdel.1
-#usr/man/man1/mdeltree.1
-#usr/man/man1/mdir.1
-#usr/man/man1/mdu.1
-#usr/man/man1/mformat.1
-#usr/man/man1/minfo.1
-#usr/man/man1/mkmanifest.1
-#usr/man/man1/mlabel.1
-#usr/man/man1/mmd.1
-#usr/man/man1/mmount.1
-#usr/man/man1/mmove.1
-#usr/man/man1/mpartition.1
-#usr/man/man1/mrd.1
-#usr/man/man1/mren.1
-#usr/man/man1/mshowfat.1
-#usr/man/man1/mtools.1
-#usr/man/man1/mtoolstest.1
-#usr/man/man1/mtype.1
-#usr/man/man1/mzip.1
-#usr/man/man5/mtools.5

diff --git a/lfs/icecast b/lfs/icecast
index 4ffe9056d3e6729e1b54213553dec4bc6911db64..639783fd7d0b58a8b84a0ad3d919de4a29a26c59 100644 (file)
--- a/lfs/icecast
+++ b/lfs/icecast
@@ -38,7 +38,7 @@ PAK_VER    = 1
 
 DESCDE     = "Ein Musik-Streamer."
 DESCEN     = "A music streamer."
-DEPS       = "libshout"
+DEPS       = "libshout lame sox libvorbis libogg"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/mtools b/lfs/mtools
deleted file mode 100644 (file)
index 1d7f29d..0000000
--- a/lfs/mtools
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-# 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    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 3.9.10
-
-THISAPP    = mtools-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 19bc1f06e9c5865b8ad20b1ddd976f5f
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 777ea6f074361b7d5a2f5c5a33a1445b70866bcb..1d36d55b78a1b8f3aad9018e68ab2d2560b603b0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -420,7 +420,6 @@ buildipfire() {
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
-  ipfiremake mtools
   ipfiremake nano
   ipfiremake nasm
   ipfiremake URI

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 3e272716dc1af998eee6ef89a46a83746879e65e..3fc800e134b2ed5153725f1a5faf108815dc6a2b 100644 (file)
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -5,10 +5,6 @@
  *
  * (c) Lawrence Manning, 2001
  * Contains main entry point, and misc functions.
- * 
- * modified 16/11/2002 eoberlander - French language added
- *
- * $Id: main.c,v 1.4.2.7 2005/12/01 20:13:08 eoberlander Exp $
  *
  */
 
@@ -84,7 +80,6 @@ int main(int argc, char *argv[])
 
        if (!ctr)
        {
-               /* zh,lt,ro,ru,th languages not available in setup, so use English */
                for (choice = 0; shortlangnames[choice]; choice++)
                {
                        if (strcmp(shortlangnames[choice], "en") == 0)
@@ -99,11 +94,10 @@ int main(int argc, char *argv[])
        sections[1] = ctr[TR_TIMEZONE];
        sections[2] = ctr[TR_HOSTNAME];
        sections[3] = ctr[TR_DOMAINNAME];
-       sections[4] = ctr[TR_ISDN_CONFIGURATION];
-       sections[5] = ctr[TR_NETWORKING];
-       sections[6] = ctr[TR_ROOT_PASSWORD];
-       sections[7] = ctr[TR_ADMIN_PASSWORD];
-       sections[8] = NULL;
+       sections[4] = ctr[TR_NETWORKING];
+       sections[5] = ctr[TR_ROOT_PASSWORD];
+       sections[6] = ctr[TR_ADMIN_PASSWORD];
+       sections[7] = NULL;
 
        newtInit();
        newtCls();
@@ -151,18 +145,14 @@ int main(int argc, char *argv[])
                                        break;
 
                                case 4:
-                                       handleisdn();
-                                       break;
-
-                               case 5:
                                        handlenetworking();
                                        break;
 
-                               case 6:
+                               case 5:
                                        handlerootpassword();
                                        break;
                                        
-                               case 7:
+                               case 6:
                                        handleadminpassword();
                                        break;
                
@@ -181,8 +171,6 @@ int main(int argc, char *argv[])
                        goto EXIT;
                if (!(handledomainname()))
                        goto EXIT;
-//             if (!(handleisdn()))
-//                     goto EXIT;
                if (!(handlenetworking()))
                        goto EXIT;
                if (!(handledhcp()))
@@ -213,4 +201,3 @@ EXIT:
 
        return 0;
 }
-

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 3370162862761b4aa9945a14ebd909a9b7bc2e53..a91a2c2aedc42c84fa99476156a108b068d2a726 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -760,8 +760,9 @@ sub checkcryptodb {
        unless ( "$ret" eq "0" ) {
                message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
                message("CRYPTO WARN: It's normal to see this on first execution.");
-               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --status-fd 2 --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
-               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --status-fd 2 --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
+               my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fs 2";
+               system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
+               system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
        } else {
                logger("CRYPTO INFO: Database is okay");
        }