Clamav-Update

Einige Aenderungen rueckgaengig gemacht...
Bisschen Pakfire gemacht...

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

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 53d78321ffd4766a731e6ae8873d1dffa8980e87..cad39c6fcbb5684a24c77a1eb9cb8b89f1975a60 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -9,7 +9,7 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.2
-usr/lib/libclamav.so.2.0.6
+usr/lib/libclamav.so.2.0.7
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 #usr/share/clamav

diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire
index 11be824511ceda30507ed52c7b8d98982d88e9c5..0f554dfe931eda2ba7ab2c5a3eb57f142db9d10a 100644 (file)
--- a/config/rootfiles/packages/mpfire
+++ b/config/rootfiles/packages/mpfire
@@ -8,8 +8,8 @@ var/ipfire/mpfire/db
 var/ipfire/mpfire/db/songs.db
 var/ipfire/mpfire/playlist
 var/ipfire/mpfire/settings
-usr/lib/perl5/5.8.8/MP3/Info.pm
-usr/lib/perl5/5.8.8/MP3/Tag.pm
-usr/lib/perl5/5.8.8/MP3/Tag/File.pm
-usr/lib/perl5/5.8.8/MP3/Tag/ID3v1.pm
-usr/lib/perl5/5.8.8/MP3/Tag/ID3v2.pm
+usr/lib/perl5/site_perl/5.8.8/MP3/Info.pm
+usr/lib/perl5/site_perl/5.8.8/MP3/Tag.pm
+usr/lib/perl5/site_perl/5.8.8/MP3/Tag/File.pm
+usr/lib/perl5/site_perl/5.8.8/MP3/Tag/ID3v1.pm
+usr/lib/perl5/site_perl/5.8.8/MP3/Tag/ID3v2.pm

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index fc7f152d3e686732a7b67d5c33899ef05aeb5efa..838f8a4babc371823bb3201755994a0cd74e5919 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,5 +1,4 @@
 == List of softwares used to build IPFire Version: 2.0t4 ==
-* 3c5x9setup-1.00
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27
@@ -57,6 +56,7 @@
 * cdrtools-2.01
 * cftp-0.12
 * clamav-0.91
+* clamav-0.91.1
 * coreutils-5.96
 * cpio-2.6
 * cups-1.2.2

diff --git a/lfs/clamav b/lfs/clamav
index 6b4644f5db7c9e234bb28fffbc28613d698ac68c..b52577afeaa065c754f2aa70a52db4a383c7d680 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 0.91
+VER        = 0.91.1
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 35192423e44642c86ea69dc93f59cfb1
+$(DL_FILE)_MD5 = 60152bf1e24b3fbdf0473794199e5215
 
 install : $(TARGET)
 

diff --git a/lfs/configroot b/lfs/configroot
index fa2fd19e040de5fc24be296e9c98ed98eb78ee8f..0673748117f3eafa891f14a4816a5538669e0250 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -81,9 +81,6 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/countries.pl                       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/graphs.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/advoptions-list            $(CONFIG_ROOT)/dhcp/advoptions-list
-       cp $(DIR_SRC)/config/cfgroot/backup-exclude             $(CONFIG_ROOT)/backup/exclude.system
-       cp $(DIR_SRC)/config/cfgroot/backup-include             $(CONFIG_ROOT)/backup/include.system
-       cp $(DIR_SRC)/config/cfgroot/backup-exclude.hardware    $(CONFIG_ROOT)/backup/exclude.hardware
        cp $(DIR_SRC)/config/cfgroot/connscheduler-lib.pl       $(CONFIG_ROOT)/connscheduler/lib.pl
        cp $(DIR_SRC)/config/cfgroot/connscheduler.conf         $(CONFIG_ROOT)/connscheduler
        cp $(DIR_SRC)/config/extrahd/*                          $(CONFIG_ROOT)/extrahd/bin/

diff --git a/src/misc-progs/qosctrl.c b/src/misc-progs/qosctrl.c
index bf2cbe7a45ec325ab78cfd4a42a77840ce05375f..023655715e075f90ca154186a00a1eccfb1ba97d 100644 (file)
--- a/src/misc-progs/qosctrl.c
+++ b/src/misc-progs/qosctrl.c
@@ -26,6 +26,7 @@ int main(int argc, char *argv[]) {
                exit(1);
        }
 
+       safe_system("chmod 755 /var/ipfire/qos/bin/qos.sh &>/dev/null");
        if (strcmp(argv[1], "start") == 0) {
                 if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1)
                {

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 9153273abcdadb31a5f7eed7ed6e0e7a783f8b2d..6edde334fc96857c3893fd388f08d792432f25c6 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -98,7 +98,7 @@ sub fetchfile {
                logger("HTTP-Status-Code: $code - $log");
                
                if ( $code eq "500" ) {
-                       message("Giving up: There was no chance to get teh file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it.");
+                       message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it.");
                        return 1;
                }
                
@@ -156,8 +156,12 @@ sub selectmirror {
 
        ### Count the number of the servers in the list
        my $scount = 0;
+       my @newlines;
        foreach (@lines) {
-               $scount++;
+               if ("$_" =~ /.*;.*;.*;/ ) {
+                       push(@newlines,$_);
+                       $scount++;
+               }
        }
        logger("$scount servers found in list.");
        
@@ -171,7 +175,7 @@ sub selectmirror {
                $servers = 0;
                my ($line, $proto, $path, $host);
                my @templine;
-               foreach $line (@lines) {
+               foreach $line (@newlines) {
                        $servers++;
                        if ($servers eq $server) {
                                @templine = split(/\;/, $line);
@@ -297,10 +301,6 @@ sub resolvedeps {
        
        message("");
        message("## Resolving dependencies for $pak...");
-       #if (&isinstalled($pak) eq 0) {
-       #       my @empty;
-       #       return @empty;
-       #}
        
        open(FILE, "<$Conf::dbdir/meta/meta-$pak");
        my @file = <FILE>;
@@ -327,8 +327,7 @@ sub resolvedeps {
                        } 
                }
        }
-       
-       #my @tempdeps = @deps;
+
        foreach (@tempdeps) {
                if ($_) {
                        my @newdeps = resolvedeps("$_");
@@ -474,13 +473,15 @@ sub setuppak {
        
        my $return = system("cd $Conf::tmpdir && NAME=$pak ./install.sh >> $Conf::logdir/install-$pak.log 2>&1");
        $return %= 255;
+       if ($pakfiresettings{'UUID'} ne "off") {
+               fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&ipak=$pak&return=$return", "$Conf::mainserver");
+       }
        if ($return == 0) {
          move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
          copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/");
                message("Setup completed. Congratulations!");
                message("################################################################################");
-               fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&ipak=$pak&return=$return", "$Conf::mainserver");
        } else {
                message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem.");
                exit $return;
@@ -507,11 +508,13 @@ sub upgradepak {
 
        my $return = system("cd $Conf::tmpdir && NAME=$pak ./update.sh >> $Conf::logdir/update-$pak.log 2>&1");
        $return %= 255;
+       if ($pakfiresettings{'UUID'} ne "off") {
+               fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&upak=$pak&return=$return", "$Conf::mainserver");
+       }
        if ($return == 0) {
          move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
                copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/");
-               fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&upak=$pak&return=$return", "$Conf::mainserver");
                message("Upgrade completed. Congratulations!");
        } else {
                message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem.");
@@ -529,6 +532,9 @@ sub removepak {
 
        my $return = system("cd $Conf::tmpdir && NAME=$pak ./uninstall.sh >> $Conf::logdir/uninstall-$pak.log 2>&1");
        $return %= 255;
+       if ($pakfiresettings{'UUID'} ne "off") {
+               fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver");
+       }
        if ($return == 0) {
          open(FILE, "<$Conf::dbdir/rootfiles/$pak");
                my @file = <FILE>;
@@ -541,7 +547,6 @@ sub removepak {
                }
          unlink("$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
-         fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver");
                message("Uninstall completed. Congratulations!");
        } else {
                message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem.");

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 91d5fe7d5e2daa517a9433e7a0d43d1150c64419..83ad84e5dd012575ea2284de1bd3027e4a095811 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -154,6 +154,52 @@
                }
                
        } elsif ("$ARGV[0]" eq "remove") {
+               shift;
+               
+               my @paks;
+               my $pak;
+               
+               foreach $pak (@ARGV) {
+                       unless ("$pak" =~ "^-") {
+                               $return = &Pakfire::isinstalled($pak);
+                               if ($return ne 0) {
+                                       &Pakfire::message("Package $pak is not installed.");
+                                       next;
+                               }
+                       
+                               push(@paks, $pak);
+                       
+                       }
+               }
+               
+               unless (@paks) {
+                       &Pakfire::message("No packages to remove. Exiting...");
+                       exit 1;
+               }
+               
+               &Pakfire::message("");
+               &Pakfire::message("");
+               &Pakfire::message("### Packages to remove:");
+               foreach $pak (sort @paks) {
+                 my $size = &Pakfire::getsize("$pak");
+                       $size = &Pakfire::beautifysize($size);
+                 &Pakfire::message("# $pak  \t\t - $size");
+               }
+               
+               if ($interactive) {
+                 &Pakfire::message("Is this okay? [y/N]");
+                       my $ret = <STDIN>;
+                       chomp($ret);
+                       &Pakfire::logger("Answer: $ret");
+                       if ( $ret ne "y" ) {
+                         &Pakfire::message("Installation aborted.");
+                         exit 1;
+                       }
+               }
+               
+               foreach $pak (@paks) {
+                       &Pakfire::removepak("$pak");
+               }
        
        
        } elsif ("$ARGV[0]" eq "update") {