Fixes:

  * libPNG12 fehlte für makegraphs
  * md5sums erhielten den falschen Namen (ohne Unterstrich)
Geändert:
  * QoS leicht erweitert.

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

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index a0974562080b150861084e29dbcb90c7eac7cb9d..13e7eeb34438b874dcc651dda1013bf8c92c79a9 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -169,22 +169,24 @@ foreach $classentry (sort @classes)
 }
 foreach $subclassentry (sort @subclasses) {
        @subclassline = split( /\;/, $subclassentry );
-       $qossettings{'DEVICE'} = $subclassline[0];
-       $qossettings{'CLASS'} = $subclassline[1];
-       $qossettings{'SCLASS'} = $subclassline[2];
-       $qossettings{'SPRIO'} = $subclassline[3];
-       $qossettings{'SRATE'} = $subclassline[4];
-       $qossettings{'SCEIL'} = $subclassline[5];
-       $qossettings{'SBURST'} = $subclassline[6];
-       $qossettings{'SCBURST'} = $subclassline[7];
-       print "\ttc class add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} classid 1:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
-       if ($qossettings{'SBURST'} > 0) {
-               print "burst $qossettings{'SBURST'}k ";
-       }
-       if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
-               print "cburst $qossettings{'CBURST'}k";
+       if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
+               $qossettings{'DEVICE'} = $subclassline[0];
+               $qossettings{'CLASS'} = $subclassline[1];
+               $qossettings{'SCLASS'} = $subclassline[2];
+               $qossettings{'SPRIO'} = $subclassline[3];
+               $qossettings{'SRATE'} = $subclassline[4];
+               $qossettings{'SCEIL'} = $subclassline[5];
+               $qossettings{'SBURST'} = $subclassline[6];
+               $qossettings{'SCBURST'} = $subclassline[7];
+               print "\ttc class add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} classid 1:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
+               if ($qossettings{'SBURST'} > 0) {
+                       print "burst $qossettings{'SBURST'}k ";
+               }
+               if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
+                       print "cburst $qossettings{'CBURST'}k";
+               }
+               print "\n";
        }
-       print "\n";
 }
 
 print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
@@ -221,7 +223,7 @@ foreach $subclassentry (sort @subclasses) {
                $qossettings{'DEVICE'} = $subclassline[0];
                $qossettings{'CLASS'} = $subclassline[1];
                $qossettings{'SCLASS'} = $subclassline[2];
-               print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n";
+               print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n";
        }
 }
 print <<END
@@ -453,7 +455,7 @@ foreach $subclassentry (sort @subclasses) {
                $qossettings{'DEVICE'} = $subclassline[0];
                $qossettings{'CLASS'} = $subclassline[1];
                $qossettings{'SCLASS'} = $subclassline[2];
-               print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
+               print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
        }
 }
 print <<END
@@ -593,4 +595,3 @@ END
 
 ############################################################################################################################
 ############################################################################################################################
-

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 27bf76d14f7197f7a5767a8fd28f929a133b0227..9c6a72887bc90369419176b67bf38bef7669526a 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,9 @@
 ------------------------------------------------------------------------
+r252 | ms | 2006-08-19 22:26:47 +0200 (Sat, 19 Aug 2006) | 2 lines
+
+Geaendert:
+  * LibPNG-Files-Fix
+------------------------------------------------------------------------
 r251 | ms | 2006-08-19 20:09:18 +0200 (Sat, 19 Aug 2006) | 5 lines
 
 Programmupdate:

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 135b9e2f805fcd87472569e56f21a1c83847f9b9..fd8fee4516c43645a81190c4b9ed5f9a259ea949 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -352,6 +352,20 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
        }
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 }
+elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
+{
+       &Header::openbox('100%', 'left', 'QoS Status');
+       if ($qossettings{'ENABLED'} eq 'on'){
+               my $output = "";
+               $output = `/usr/local/bin/qosctrl status`;
+               $output = &Header::cleanhtml($output,"y");
+               print "<pre>$output</pre>\n";
+       } else { print "QoS ist nicht aktiviert!"; }
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit
+}
 elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
 {
        &parentclass();
@@ -460,7 +474,7 @@ END
                <tr><td width='40%' align='right'>Uploadstandardklasse:         <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'}
                <tr><td width='40%' align='right'>ACKs:                         <td width='40%' align='left'>$qossettings{'ACK'}
                <tr><td colspan='3' width='100%'><hr>
-               <tr><td colspan='3' width='100%' align='center'><input type='submit' name='ACTION' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' value='Erweiterte Einstellungen'>
+               <tr><td colspan='3' width='100%' align='center'><input type='submit' name='ACTION' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' value='Erweiterte Einstellungen'><input type='submit' name='ACTION' value='Statusinformationen'>
        </form>
 END
 ;

diff --git a/make.sh b/make.sh
index b67011261780569f39e53285c50ea65ff4edaaf9..666f4adb3884d5128e444b69eeac6366813afc3b 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -1558,7 +1558,8 @@ unattended)
        fi
 
        echo "### MAKING SOURCES-ISO"
-       $0 sources-iso
+       echo "DISABLED by Delaco!"
+       #$0 sources-iso
 
        echo "### UPLOADING ISO"
        $0 upload iso

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 00315235c77503a229082560fced4bc26985fb68..f4e413638c87bd227b0b76bb6fd689179d8b00dc 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -19612,9 +19612,9 @@ usr/lib/libpcap.so.0.8
 #usr/lib/libpng.la
 usr/lib/libpng.so
 #usr/lib/libpng12.la
-#usr/lib/libpng12.so
-#usr/lib/libpng12.so.0
-#usr/lib/libpng12.so.0.12.0
+usr/lib/libpng12.so
+usr/lib/libpng12.so.0
+usr/lib/libpng12.so.0.12.0
 #usr/lib/pkgconfig/libpng.pc
 #usr/lib/pkgconfig/libpng12.pc
 #usr/share/man/man3/libpng.3
@@ -22575,6 +22575,7 @@ usr/local/bin/ipsecctrl
 usr/local/bin/launch-ether-wake
 usr/local/bin/logwatch
 usr/local/bin/openvpnctrl
+usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
 usr/local/bin/restartdhcp
 usr/local/bin/restartntpd

diff --git a/src/misc-progs/qosctrl.c b/src/misc-progs/qosctrl.c
index ee6450206e4d25d50675e97d035a8871d0b3ce4f..ac9fd37504e7ec2c778b80c8e666552ce75111e7 100644 (file)
--- a/src/misc-progs/qosctrl.c
+++ b/src/misc-progs/qosctrl.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
                exit(1);
 
        if (argc < 2) {
-               fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|clear|status)\n\n");
+               fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status)\n\n");
                exit(1);
        }
 
@@ -38,12 +38,14 @@ int main(int argc, char *argv[]) {
                        {
                                safe_system("/var/ipfire/qos/bin/qos.sh start");
                        }       
-               } else if (strcmp(argv[1], "clear") == 0) {
+               } else if (strcmp(argv[1], "stop") == 0) {
                        safe_system("/var/ipfire/qos/bin/qos.sh clear");
                } else if (strcmp(argv[1], "status") == 0) {
                        safe_system("/var/ipfire/qos/bin/qos.sh status");
+               } else if (strcmp(argv[1], "restart") == 0) {
+                       safe_system("/var/ipfire/qos/bin/qos.sh restart");
                } else {
-                       fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|clear|status)\n\n");
+                       fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status)\n\n");
                        exit(1);
                }
 

diff --git a/src/paks/ncftp/ROOTFILES b/src/paks/ncftp/ROOTFILES
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9543ada221237b020d60c89e64bc4ddf2778c471 100644 (file)
--- a/src/paks/ncftp/ROOTFILES
+++ b/src/paks/ncftp/ROOTFILES
@@ -0,0 +1,17 @@
+usr/bin/ncftp
+usr/bin/ncftpbatch
+usr/bin/ncftpbookmarks
+usr/bin/ncftpget
+usr/bin/ncftpls
+usr/bin/ncftpput
+usr/bin/ncftpspooler
+#usr/include/ncftp.h
+#usr/include/ncftp_errno.h
+usr/lib/libncftp.so
+usr/lib/libncftp.so.2
+#usr/share/man/man1/ncftp.1
+#usr/share/man/man1/ncftpbatch.1
+#usr/share/man/man1/ncftpget.1
+#usr/share/man/man1/ncftpls.1
+#usr/share/man/man1/ncftpput.1
+#usr/share/man/man1/ncftpspooler.1

diff --git a/src/scripts/packager b/src/scripts/packager
index 6a9a6272dbbae80ca8dea0419cdb0d3ab2145fa7..effffeb7826fa77c07abacce977e47c4f5bdf7ea 100644 (file)
--- a/src/scripts/packager
+++ b/src/scripts/packager
@@ -26,7 +26,7 @@ else
        cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
        tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES
 
-       cd /install/packages && md5sum $PROG*.tar.gz > $PROG-$VER-$PAK_VER.tar.gz.md5
+       cd /install/packages && md5sum $PROG*.tar.gz > $PROG-${VER}_$PAK_VER.tar.gz.md5
        cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5
        rm -rf /install/packages/package
        exit 0