From 92b5fba450fe2cc7b296c3f29134741e1ef16bfc Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 20 Aug 2006 20:12:57 +0000 Subject: [PATCH] =?utf8?q?Fixes:=20=20=20*=20libPNG12=20fehlte=20f=C3=BCr?= =?utf8?q?=20makegraphs=20=20=20*=20md5sums=20erhielten=20den=20falschen?= =?utf8?q?=20Namen=20(ohne=20Unterstrich)=20Ge=C3=A4ndert:=20=20=20*=20QoS?= =?utf8?q?=20leicht=20erweitert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@253 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/qos/makeqosscripts.pl | 37 ++++++++++++++++++------------------ doc/ChangeLog | 5 +++++ html/cgi-bin/qos.cgi | 16 +++++++++++++++- make.sh | 3 ++- src/ROOTFILES.i386 | 7 ++++--- src/misc-progs/qosctrl.c | 8 +++++--- src/paks/ncftp/ROOTFILES | 17 +++++++++++++++++ src/scripts/packager | 2 +- 8 files changed, 68 insertions(+), 27 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index a097456208..13e7eeb344 100644 --- 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 <$output\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 Uploadstandardklasse: $qossettings{'DEFCLASS_OUT'} ACKs: $qossettings{'ACK'}
- + END ; diff --git a/make.sh b/make.sh index b670112617..666f4adb38 100644 --- 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 00315235c7..f4e413638c 100644 --- 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 ee6450206e..ac9fd37504 100644 --- 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 e69de29bb2..9543ada221 100644 --- 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 6a9a6272db..effffeb782 100644 --- 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 -- 2.39.2