From 7ccede9b397ea877868bc837d93d8c3ce5b370b9 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 26 Aug 2006 13:20:12 +0000 Subject: [PATCH] Hinzugefuegt: * QoS-Graphen - Erste Version! Pakete: * Applejuice bearbeitet * Depends.txt in alle eingefuegt * Clamav bearbeitet git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@258 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/qos/RRD-func.pl | 4 -- doc/ChangeLog | 8 +++ html/cgi-bin/qos.cgi | 116 +++++++++++++++++++++++++++++- lfs/applejuice | 5 +- make.sh | 2 + src/misc-progs/qosctrl.c | 2 +- src/paks/amavisd/depends.txt | 0 src/paks/applejuice/ROOTFILES | 4 +- src/paks/applejuice/depends.txt | 1 + src/paks/applejuice/install.sh | 1 - src/paks/applejuice/uninstall.sh | 2 - src/paks/asterisk/depends.txt | 0 src/paks/bristuff/depends.txt | 0 src/paks/cftp/depends.txt | 0 src/paks/clamav/depends.txt | 0 src/paks/clamav/install.sh | 1 - src/paks/clamav/uninstall.sh | 2 - src/paks/cups/depends.txt | 0 src/paks/cyrusimap/depends.txt | 0 src/paks/edonkeyclc/depends.txt | 0 src/paks/ethereal/depends.txt | 0 src/paks/fetchmail/depends.txt | 0 src/paks/ghostscript/depends.txt | 0 src/paks/gnump3d/depends.txt | 0 src/paks/iptraf/depends.txt | 0 src/paks/java/depends.txt | 0 src/paks/lame/depends.txt | 0 src/paks/libjpeg/depends.txt | 0 src/paks/libogg/depends.txt | 0 src/paks/libpri/depends.txt | 0 src/paks/libtiff/depends.txt | 0 src/paks/libvorbis/depends.txt | 0 src/paks/libxml2/depends.txt | 0 src/paks/lynx/depends.txt | 0 src/paks/mailx/depends.txt | 0 src/paks/mc/depends.txt | 0 src/paks/mldonkey/depends.txt | 0 src/paks/mpg123/depends.txt | 0 src/paks/ncftp/depends.txt | 0 src/paks/nfs/depends.txt | 0 src/paks/nmap/depends.txt | 0 src/paks/ntop/depends.txt | 0 src/paks/portmap/ROOTFILES | 3 + src/paks/portmap/depends.txt | 0 src/paks/postfix/depends.txt | 0 src/paks/procmail/depends.txt | 0 src/paks/razor/depends.txt | 0 src/paks/rsync/depends.txt | 0 src/paks/samba/depends.txt | 0 src/paks/sane/depends.txt | 0 src/paks/sox/depends.txt | 0 src/paks/spamassassin/depends.txt | 0 src/paks/spandsp/depends.txt | 0 src/paks/stunnel/depends.txt | 0 src/paks/subversion/depends.txt | 0 src/paks/tcpwrapper/depends.txt | 0 src/paks/tftp-hpa/depends.txt | 0 src/paks/web-cyradm/depends.txt | 0 src/paks/xampp/depends.txt | 0 src/paks/xinetd/depends.txt | 0 src/paks/zaptel/depends.txt | 0 src/scripts/packager | 3 +- src/scripts/qosd | 4 +- 63 files changed, 141 insertions(+), 17 deletions(-) create mode 100644 src/paks/amavisd/depends.txt create mode 100644 src/paks/applejuice/depends.txt create mode 100644 src/paks/asterisk/depends.txt create mode 100644 src/paks/bristuff/depends.txt create mode 100644 src/paks/cftp/depends.txt create mode 100644 src/paks/clamav/depends.txt create mode 100644 src/paks/cups/depends.txt create mode 100644 src/paks/cyrusimap/depends.txt create mode 100644 src/paks/edonkeyclc/depends.txt create mode 100644 src/paks/ethereal/depends.txt create mode 100644 src/paks/fetchmail/depends.txt create mode 100644 src/paks/ghostscript/depends.txt create mode 100644 src/paks/gnump3d/depends.txt create mode 100644 src/paks/iptraf/depends.txt create mode 100644 src/paks/java/depends.txt create mode 100644 src/paks/lame/depends.txt create mode 100644 src/paks/libjpeg/depends.txt create mode 100644 src/paks/libogg/depends.txt create mode 100644 src/paks/libpri/depends.txt create mode 100644 src/paks/libtiff/depends.txt create mode 100644 src/paks/libvorbis/depends.txt create mode 100644 src/paks/libxml2/depends.txt create mode 100644 src/paks/lynx/depends.txt create mode 100644 src/paks/mailx/depends.txt create mode 100644 src/paks/mc/depends.txt create mode 100644 src/paks/mldonkey/depends.txt create mode 100644 src/paks/mpg123/depends.txt create mode 100644 src/paks/ncftp/depends.txt create mode 100644 src/paks/nfs/depends.txt create mode 100644 src/paks/nmap/depends.txt create mode 100644 src/paks/ntop/depends.txt create mode 100644 src/paks/portmap/depends.txt create mode 100644 src/paks/postfix/depends.txt create mode 100644 src/paks/procmail/depends.txt create mode 100644 src/paks/razor/depends.txt create mode 100644 src/paks/rsync/depends.txt create mode 100644 src/paks/samba/depends.txt create mode 100644 src/paks/sane/depends.txt create mode 100644 src/paks/sox/depends.txt create mode 100644 src/paks/spamassassin/depends.txt create mode 100644 src/paks/spandsp/depends.txt create mode 100644 src/paks/stunnel/depends.txt create mode 100644 src/paks/subversion/depends.txt create mode 100644 src/paks/tcpwrapper/depends.txt create mode 100644 src/paks/tftp-hpa/depends.txt create mode 100644 src/paks/web-cyradm/depends.txt create mode 100644 src/paks/xampp/depends.txt create mode 100644 src/paks/xinetd/depends.txt create mode 100644 src/paks/zaptel/depends.txt diff --git a/config/qos/RRD-func.pl b/config/qos/RRD-func.pl index 4642f1333f..e0b094488a 100644 --- a/config/qos/RRD-func.pl +++ b/config/qos/RRD-func.pl @@ -20,10 +20,6 @@ use RRDs; -if (not defined $rrd_datadir) { - our $rrd_datadir = "/var/spool/rrdqueues/"; -} - if (not defined $STEP) { my $STEP=10; } diff --git a/doc/ChangeLog b/doc/ChangeLog index 333c5af45f..999984b07f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +------------------------------------------------------------------------ +r257 | ms | 2006-08-26 10:42:48 +0200 (Sat, 26 Aug 2006) | 5 lines + +Update: + * Pakfire! +Fixes: + * ConnScheduler + ------------------------------------------------------------------------ r256 | ms | 2006-08-23 23:55:46 +0200 (Wed, 23 Aug 2006) | 8 lines diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 1ecc84fe0d..ef26457f90 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -7,6 +7,7 @@ # (c) The IPFire Team # +use RRDs; use strict; # enable only the following on debugging purpose use warnings; @@ -85,6 +86,9 @@ $qossettings{'DOCLASS'} = ''; $qossettings{'DOSCLASS'} = ''; $qossettings{'DOLEVEL7'} = ''; $qossettings{'DOPORT'} = ''; +$qossettings{'CLASS'} = ''; +$qossettings{'CLASSPRFX'} = ''; +$qossettings{'DEV'} = ''; &General::readhash("${General::swroot}/qos/settings", \%qossettings); @@ -373,6 +377,39 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen') &Header::closepage(); exit } +elsif ($qossettings{'ACTION'} eq 'Grafische Auswertung') +{ + &Header::openbox('100%', 'left', 'QoS Graphen'); + print <Diese Seite braucht je nach Geschwindigkeit des Computers laenger zum Laden. +END +; + open( FILE, "< $classfile" ) or die "Unable to read $classfile"; + @classes = ; + close FILE; + foreach $classentry (sort @classes) + { + @classline = split( /\;/, $classentry ); + $qossettings{'DEV'}=$classline[0]; + $qossettings{'CLASS'}=$classline[1]; + &gengraph($qossettings{'DEV'},$qossettings{'CLASS'}); + print <$qossettings{'CLASS'} ($qossettings{'DEV'}) + + + +END +; + } +print < +END +; + &Header::closebox(); + &Header::closebigbox(); + &Header::closepage(); + exit +} elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen') { &parentclass(); @@ -481,7 +518,13 @@ END Uploadstandardklasse: $qossettings{'DEFCLASS_OUT'} ACKs: $qossettings{'ACK'}
- + + +
+ +
+ +
END ; @@ -1329,3 +1372,74 @@ sub validsubclass { } } } + +sub gengraph { + $qossettings{'DEV'} = shift; + $qossettings{'CLASS'} = shift; + my $ERROR=""; + if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { + $qossettings{'CLASSPRFX'} = '1'; + } else { + $qossettings{'CLASSPRFX'} = '2'; + } + + RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png", + "--start", "-3240", "-aPNG", "-i", "-z", + "--alt-y-grid", "-w 800", "-h 150", "-r", + "--color", "SHADEA#EAE9EE", + "--color", "SHADEB#EAE9EE", + "--color", "BACK#FFFFFF", + "-t $qossettings{'CLASS'} ($qossettings{'DEV'})", + "DEF:pkts=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:pkts:AVERAGE", + "DEF:dropped=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:dropped:AVERAGE", + "DEF:overlimits=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:overlimits:AVERAGE", + "AREA:pkts#00FFFF:packets", + "GPRINT:pkts:LAST:total packets\\:%8.3lf %s packets\\j", + "LINE3:dropped#FF0000:dropped", + "GPRINT:dropped:LAST:dropped packets\\:%8.3lf %s packets\\j", + "LINE3:overlimits#0000FF:overlimits", + "GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j", + ); + $ERROR = RRDs::error; + print "$ERROR"; + + RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-borrowed.png", + "--start", "-3240", "-aPNG", "-i", "-z", + "--alt-y-grid", "-w 800", "-h 150", "-r", + "--color", "SHADEA#EAE9EE", + "--color", "SHADEB#EAE9EE", + "--color", "BACK#FFFFFF", + "-t $qossettings{'CLASS'} ($qossettings{'DEV'})", + "DEF:lended=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:lended:AVERAGE", + "DEF:borrowed=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:borrowed:AVERAGE", + "DEF:giants=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:giants:AVERAGE", + "AREA:lended#99ff99:lended", + "GPRINT:lended:LAST:lended\\:%8.3lf %s packets\\j", + "LINE3:borrowed#f70566:borrowed", + "GPRINT:borrowed:LAST:borrowed\\:%8.3lf %s packets\\j", + "LINE3:giants#05ad05:giants", + "GPRINT:giants:LAST:giants\\:%8.3lf %s packets\\j", + ); + $ERROR = RRDs::error; + print "$ERROR"; + + RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-bytes.png", + "--start", "-3240", "-aPNG", "-i", "-z", + "--alt-y-grid", "-w 800", "-h 150", "-r", + "--color", "SHADEA#EAE9EE", + "--color", "SHADEB#EAE9EE", + "--color", "BACK#FFFFFF", + "-t $qossettings{'CLASS'} ($qossettings{'DEV'})", + "DEF:bits=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:bits:AVERAGE", + "DEF:bytes=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:bytes:AVERAGE", + "CDEF:kbytes=bytes,1024,/", + "CDEF:kbits=bits,1024,/,8,/", + "AREA:kbytes#FFBE7D:kbytes", + "GPRINT:kbytes:LAST:rate\\: %8.3lf kbytes\\j", + "GPRINT:kbits:LAST:rate\\:%8.2lf kbits\\r", + ); + $ERROR = RRDs::error; + print "$ERROR"; + + +} \ No newline at end of file diff --git a/lfs/applejuice b/lfs/applejuice index 797b49e666..ac9a06bc2b 100644 --- a/lfs/applejuice +++ b/lfs/applejuice @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = applejuice -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules @@ -80,5 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice cd $(DIR_APP) && cp -rfv phpaj /opt/lampp/htdocs + -mkdir /var/ipfire/applejuice + echo "RAMSIZE=64" > /var/ipfire/applejuice/settings + chown nobody.nobody /var/ipfire/applejuice -R @rm -rf $(DIR_APP) @$(POSTBUILD) \ No newline at end of file diff --git a/make.sh b/make.sh index 8a138dc73a..ef4dfc0fd8 100644 --- a/make.sh +++ b/make.sh @@ -860,6 +860,8 @@ buildpackages() { cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES fi done + cd $BASEDIR/packages; ls -w1 *.tar.gz | awk -F ".tar.gz" '{ print $1 }' > $BASEDIR/packages/packages_list.txt + echo "###EOF###" >> $BASEDIR/packages/packages_list.txt cd $PWD diff --git a/src/misc-progs/qosctrl.c b/src/misc-progs/qosctrl.c index f3b288bcda..f5faaa7a08 100644 --- a/src/misc-progs/qosctrl.c +++ b/src/misc-progs/qosctrl.c @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { exit(1); } - safe_system("chmod 755 /var/ipfire/qos/bin/qos.sh"); + safe_system("chmod 755 /var/ipfire/qos/bin/qos.sh 2>&1 >/dev/null"); if (strcmp(argv[1], "start") == 0) { if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1) { diff --git a/src/paks/amavisd/depends.txt b/src/paks/amavisd/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/applejuice/ROOTFILES b/src/paks/applejuice/ROOTFILES index f3534bfb94..69de845d31 100644 --- a/src/paks/applejuice/ROOTFILES +++ b/src/paks/applejuice/ROOTFILES @@ -1,3 +1,4 @@ +etc/init.d/applejuice opt/applejuice opt/applejuice/ajcore.jar opt/applejuice/libajnetmask.so @@ -132,4 +133,5 @@ opt/lampp/htdocs/phpaj/style/tango/icons/up.png opt/lampp/htdocs/phpaj/style/tango/icons/warning.png opt/lampp/htdocs/phpaj/style/tango/icons/x.png opt/lampp/htdocs/phpaj/style/tango/tango.css -opt/lampp/htdocs/phpaj/vars.php \ No newline at end of file +opt/lampp/htdocs/phpaj/vars.php +var/ipfire/applejuice \ No newline at end of file diff --git a/src/paks/applejuice/depends.txt b/src/paks/applejuice/depends.txt new file mode 100644 index 0000000000..f3d360b1cf --- /dev/null +++ b/src/paks/applejuice/depends.txt @@ -0,0 +1 @@ +java diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh index 3a9ce551bf..2f78907fa2 100644 --- a/src/paks/applejuice/install.sh +++ b/src/paks/applejuice/install.sh @@ -8,4 +8,3 @@ # # Extract the files tar xfz files.tgz -C / -cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/applejuice/uninstall.sh b/src/paks/applejuice/uninstall.sh index ad6122665e..7ee2885e73 100644 --- a/src/paks/applejuice/uninstall.sh +++ b/src/paks/applejuice/uninstall.sh @@ -6,5 +6,3 @@ ################################################################# # # Delete the files -## Befehl fehlt noch -rm -f /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/asterisk/depends.txt b/src/paks/asterisk/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/bristuff/depends.txt b/src/paks/bristuff/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/cftp/depends.txt b/src/paks/cftp/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/clamav/depends.txt b/src/paks/clamav/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh index 3a9ce551bf..2f78907fa2 100644 --- a/src/paks/clamav/install.sh +++ b/src/paks/clamav/install.sh @@ -8,4 +8,3 @@ # # Extract the files tar xfz files.tgz -C / -cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/clamav/uninstall.sh b/src/paks/clamav/uninstall.sh index ad6122665e..7ee2885e73 100644 --- a/src/paks/clamav/uninstall.sh +++ b/src/paks/clamav/uninstall.sh @@ -6,5 +6,3 @@ ################################################################# # # Delete the files -## Befehl fehlt noch -rm -f /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/cups/depends.txt b/src/paks/cups/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/cyrusimap/depends.txt b/src/paks/cyrusimap/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/edonkeyclc/depends.txt b/src/paks/edonkeyclc/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/ethereal/depends.txt b/src/paks/ethereal/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/fetchmail/depends.txt b/src/paks/fetchmail/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/ghostscript/depends.txt b/src/paks/ghostscript/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/gnump3d/depends.txt b/src/paks/gnump3d/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/iptraf/depends.txt b/src/paks/iptraf/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/java/depends.txt b/src/paks/java/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/lame/depends.txt b/src/paks/lame/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libjpeg/depends.txt b/src/paks/libjpeg/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libogg/depends.txt b/src/paks/libogg/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libpri/depends.txt b/src/paks/libpri/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libtiff/depends.txt b/src/paks/libtiff/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libvorbis/depends.txt b/src/paks/libvorbis/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libxml2/depends.txt b/src/paks/libxml2/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/lynx/depends.txt b/src/paks/lynx/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/mailx/depends.txt b/src/paks/mailx/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/mc/depends.txt b/src/paks/mc/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/mldonkey/depends.txt b/src/paks/mldonkey/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/mpg123/depends.txt b/src/paks/mpg123/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/ncftp/depends.txt b/src/paks/ncftp/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/nfs/depends.txt b/src/paks/nfs/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/nmap/depends.txt b/src/paks/nmap/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/ntop/depends.txt b/src/paks/ntop/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/portmap/ROOTFILES b/src/paks/portmap/ROOTFILES index d3bdae8e7c..528386de90 100644 --- a/src/paks/portmap/ROOTFILES +++ b/src/paks/portmap/ROOTFILES @@ -4,3 +4,6 @@ usr/sbin/pmap_set #usr/share/man/man8/pmap_dump.8 #usr/share/man/man8/pmap_set.8 #usr/share/man/man8/portmap.8 +usr/lib/libwrap.so +usr/lib/libwrap.so.0 +usr/lib/libwrap.so.0.7.6 diff --git a/src/paks/portmap/depends.txt b/src/paks/portmap/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/postfix/depends.txt b/src/paks/postfix/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/procmail/depends.txt b/src/paks/procmail/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/razor/depends.txt b/src/paks/razor/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/rsync/depends.txt b/src/paks/rsync/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/samba/depends.txt b/src/paks/samba/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/sane/depends.txt b/src/paks/sane/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/sox/depends.txt b/src/paks/sox/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/spamassassin/depends.txt b/src/paks/spamassassin/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/spandsp/depends.txt b/src/paks/spandsp/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/stunnel/depends.txt b/src/paks/stunnel/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/subversion/depends.txt b/src/paks/subversion/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/tcpwrapper/depends.txt b/src/paks/tcpwrapper/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/tftp-hpa/depends.txt b/src/paks/tftp-hpa/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/web-cyradm/depends.txt b/src/paks/web-cyradm/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/xampp/depends.txt b/src/paks/xampp/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/xinetd/depends.txt b/src/paks/xinetd/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/zaptel/depends.txt b/src/paks/zaptel/depends.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/scripts/packager b/src/scripts/packager index effffeb782..586860d996 100644 --- a/src/scripts/packager +++ b/src/scripts/packager @@ -15,6 +15,7 @@ else mkdir -p /install/packages/package cp -f /usr/src/src/paks/$PROG/{,un}install.sh /install/packages/package cp -f /usr/src/src/paks/$PROG/ROOTFILES /install/packages/package + cp -f /usr/src/src/paks/$PROG/depends.txt /install/packages/package chmod 755 /install/packages/package/{,un}install.sh cd / && tar --create --directory=/ --files-from=/install/packages/package/ROOTFILES --file=/packagetmp.tar --exclude='#*' @@ -24,7 +25,7 @@ else cd / && rm -rf /tmp/* cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES - tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES + tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES depends.txt cd /install/packages && md5sum $PROG*.tar.gz > $PROG-${VER}_$PAK_VER.tar.gz.md5 cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5 diff --git a/src/scripts/qosd b/src/scripts/qosd index 2bae22ab46..23e6678cf7 100644 --- a/src/scripts/qosd +++ b/src/scripts/qosd @@ -46,8 +46,8 @@ use strict; # Configuration options: # -my $device = "imq0"; -our $rrd_datadir = "/var/log/rrd"; +my $device = "$ARGV[0]"; +our $rrd_datadir = "/var/log/rrd/"; our $event_datadir = $rrd_datadir; our $STEP = 10; our $tc_command = "/sbin/tc"; -- 2.39.2