Ein paar Schoenheitsfehler korrigiert.

Kernel Update...
Das Pakfire Timeout hoeher gesetzt.
CenterIm-Paket erstellt.

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

diff --git a/config/rootfiles/packages/centerim b/config/rootfiles/packages/centerim
new file mode 100644 (file)
index 0000000..26f9b48
--- /dev/null
+++ b/config/rootfiles/packages/centerim
@@ -0,0 +1,10 @@
+usr/bin/centerim
+usr/bin/cicqconv
+#usr/share/centerim
+usr/share/centerim/email.wav
+usr/share/centerim/msg.wav
+usr/share/centerim/offline.wav
+usr/share/centerim/online.wav
+usr/share/centerim/sms.wav
+usr/share/centerim/url.wav
+#usr/share/man/man1/cicqconv.1

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7680c8392b2a0925e0548f6e4f44c2b09a27d329..3e8bd2574729ad9349345ecb7068bd7c7b79aa53 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -51,6 +51,7 @@
 * calamaris-2.59
 * ccache-2.4
 * cdrtools-2.01
+* centerim-4.22.1
 * cftp-0.12
 * clamav-0.91.1
 * coreutils-5.96
@@ -166,7 +167,6 @@
 * misc-progs
 * mkinitcpio-0.5.9
 * mktemp-1.5
-* mldonkey-2.9.0
 * mldonkey-2.9.1
 * module-init-tools-3.2.2
 * mpc-0.12.1
@@ -209,7 +209,6 @@
 * ppp-2.4.4
 * procps-3.2.6
 * psmisc-22.2
-* r8169-6.002.00
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 568834bcd41febd999ac6a4b4cbc77bafbc1fa40..ec0f2020a19d56cd7b4158e7772e19f6c7553005 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -36,7 +36,7 @@ require "${General::swroot}/header.pl";
 &Header::openbigbox('100%', 'center');
 
 &Header::openbox('100%', 'left', 'Version');
-print "This is IPFire Build Version ".`cat /var/ipfire/firebuild`." and tagged as ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+print "This is IPFire Build ".`cat /var/ipfire/firebuild`." and tagged as ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
 &Header::closebox();
 
 &Header::openbox('100%', 'left', $Lang::tr{'credits'});

diff --git a/lfs/linux b/lfs/linux
index 55c994b52cd8b0ea993e7957d49744d26895b162..d326b0478b983e711fbcd0c4f7def8c9ec97b700 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .53
-VER        = 2.6.16.53
+PATCHLEVEL = .54
+VER        = 2.6.16.54
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -64,7 +64,7 @@ squashfs3.2-r2.tar.gz                                                 = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
 mISDN-1_1_5.tar.gz                = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
 openswan-2.4.9.tar.gz                                                  = $(URL_IPFIRE)/openswan-2.4.9.tar.gz
 
-$(DL_FILE)_MD5                                                                         = 5c6e965d9121ba0d3f3c747e519de402
+$(DL_FILE)_MD5                                                                         = 6d63369a98736bbdf0ee52f3117ae9e0
 patch-o-matic-ng-20061210.tar.bz2_MD5  = 76edac76301b45f89e467b41c8cf4393
 iptables-1.3.5.tar.bz2_MD5                             = 00fb916fa8040ca992a5ace56d905ea5
 netfilter-layer7-v2.9.tar.gz_MD5       = ebf9043a5352ebe6dbd721989ef83dee

diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/init.d/networking/any
index 35ca4f3cd98ffddfe6412321860756f8cea2c460..7d2242954944e193fd6532c89b47864c686d4421 100644 (file)
--- a/src/initscripts/init.d/networking/any
+++ b/src/initscripts/init.d/networking/any
@@ -83,7 +83,7 @@ case "${1}" in
                ;;
 
        stop)
-               boot_mesg "Removing IPv4 address ${ADDRESS} from the ${2} interface..."
+               boot_mesg "Removing IPv4 address ${ADDRESS} from the ${DEVICE} interface..."
                ip addr del ${args} dev ${DEVICE}
                evaluate_retval
                ;;

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 248dc622cb05169a609e79e3883dd861a9e928e9..0dbc28500feaf9d953bf3cffb8ca225b0e5c5502 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -160,7 +160,7 @@ sub fetchfile {
 
                my $ua = LWP::UserAgent->new;
                $ua->agent("Pakfire/$Conf::version");
-               $ua->timeout(5);
+               $ua->timeout(20);
                
                my %proxysettings=();
                &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
@@ -281,11 +281,11 @@ sub selectmirror {
        ### Check if there is a current server list and read it.
        #   If there is no list try to get one.
        my $count = 0;
-       while (!(open(FILE, "<$Conf::dbdir/lists/server-list.db")) && ($count lt 20)) {
+       while (!(open(FILE, "<$Conf::dbdir/lists/server-list.db")) && ($count lt 5)) {
                $count++;
                getmirrors("noforce");
        }
-       if ($count == 20) {
+       if ($count == 5) {
                message("MIRROR ERROR: Could not find or download a server list");
                exit 1;
        }