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

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)
 		{

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
+opt/lampp/htdocs/phpaj/vars.php
+var/ipfire/applejuice

src/paks/applejuice/depends.txt

@@ -0,0 +1 @@
+java

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

src/paks/applejuice/uninstall.sh

@@ -6,5 +6,3 @@
 #################################################################
 #
 # Delete the files
-## Befehl fehlt noch
-rm -f /opt/pakfire/installed/ROOTFILES.$2

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

src/paks/clamav/uninstall.sh

@@ -6,5 +6,3 @@
 #################################################################
 #
 # Delete the files
-## Befehl fehlt noch
-rm -f /opt/pakfire/installed/ROOTFILES.$2

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

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

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";