Clamav Update

Fix in der MPFire CGI

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 813b28c49ebcbeee8afe681be29789c11884871e..a33d4a0660efaf6bc62bd0d6bda44332d3a9802c 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -54,7 +54,7 @@
 * cdrtools-2.01
 * centerim-4.22.1
 * cftp-0.12
-* clamav-0.91.1
+* clamav-0.91.2
 * coreutils-5.96
 * cpio-2.6
 * cups-1.2.12

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index 52f4618b599096135cc5b8b4500bd658f24936ea..704adfccff35f049a9bbd69a040ca83d46d9efbc 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -41,7 +41,7 @@ my $errormessage = "";
 if ( $ENV{'QUERY_STRING'} =~ /title/){
 my $song = `/usr/local/bin/mpfirectrl song 2>/dev/null`;
 if ( $song eq "" ){$song = "None";}
-if ( length($song) > 125 ) {$song = substr($song,0,125)."...";}
+if ( length($song) > 100 ) {$song = substr($song,0,100)."...";}
 &Header::showhttpheaders();
 print"<meta http-equiv='refresh' content='30'>";
 print <<END
@@ -52,7 +52,6 @@ END
 ;
 } 
 else{
-
 &Header::showhttpheaders();
 
 sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;' />" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
@@ -258,7 +257,7 @@ $stats=~s/\\/<br \/>/g
 print <<END
 
     <table width='95%' cellspacing='0'>
-    <iframe height='30' width='100%' src='/cgi-bin/mpfire.cgi?title' scrolling='no' frameborder='no' ></iframe> 
+    <iframe height='40' width='100%' src='/cgi-bin/mpfire.cgi?title' scrolling='no' frameborder='no' ></iframe> 
 END
 ;
 my $countsongs=`/usr/local/bin/mpfirectrl stats 2>/dev/null`;
@@ -449,13 +448,13 @@ close(DATEI);
 print <<END
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='9' align='left'><b>$Lang::tr{'webradio playlist'}</b></td></tr>
-<tr><td>Stream</td><td colspan='2'></td></tr>
+<tr><td align='left'>Stream</td><td colspan='2'></td></tr>
 END
 ;
 foreach (@webradio){
  my @stream = split(/\|/,$_);
  print <<END
- <tr><td><a href="$stream[2]" target="_blank">$stream[1]</a></td>
+ <tr><td align='left'><a href="$stream[2]" target="_blank">$stream[1]</a></td>
      <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='FILE' value='$stream[0]' /><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
 </tr>
 END

diff --git a/lfs/clamav b/lfs/clamav
index 9eba902592a281815420880535eda5b5b9997dee..f560d7419502d6b0fbd03653c0f9032e1c46e5d5 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.91.1
+VER        = 0.91.2
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 60152bf1e24b3fbdf0473794199e5215
+$(DL_FILE)_MD5 = 2a7265d17cfa80c32858978f16a3f47b
 
 install : $(TARGET)