From 5d46c29e5afab019a7b160e344affec047ff0f91 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 30 Apr 2013 10:16:19 +0200
Subject: [PATCH 1/3] clamav: update to 0.97.8.

---
 config/rootfiles/packages/clamav | 6 +++---
 lfs/clamav                       | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index db38453ff..1f09b8d55 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.15
+usr/lib/libclamav.so.6.1.17
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.15
+usr/lib/libclamunrar.so.6.1.17
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.15
+usr/lib/libclamunrar_iface.so.6.1.17
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
diff --git a/lfs/clamav b/lfs/clamav
index a2ed1f066..bae350cb1 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97.6
+VER        = 0.97.8
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 21
+PAK_VER    = 22
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2
+$(DL_FILE)_MD5 = ac52bcbad3ea72eac08fedb9772f648b
 
 install : $(TARGET)
 

From 409f70463134057f709bb120a6d6eac1a0b8d453 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 14 May 2013 11:38:30 +0200
Subject: [PATCH 2/3] Fix missing closing DIV tag in maniac's theme.

---
 html/html/themes/maniac/include/functions.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index eea8091b0..62bbf101e 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -351,7 +351,8 @@ END
     &showsubsection($menu);
     &showsubsubsection($menu);
 
-	print <<END			
+	print <<END
+				</div>
 			</div>
 			<br class="clear" />	
 			<div id="footer" class="fixed">

From 7b91d99f45ba597e05ce0f837a0b16c445f89a78 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 14 May 2013 11:40:25 +0200
Subject: [PATCH 3/3] Update credits.cgi.

---
 config/rootfiles/core/68/filelists/files | 1 +
 doc/language_issues.de                   | 1 +
 doc/language_issues.en                   | 1 +
 doc/language_issues.es                   | 1 -
 doc/language_issues.fr                   | 1 -
 doc/language_issues.nl                   | 1 +
 doc/language_issues.pl                   | 1 -
 doc/language_issues.ru                   | 1 -
 html/cgi-bin/credits.cgi                 | 6 ------
 9 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files
index 15680e6b2..30874a522 100644
--- a/config/rootfiles/core/68/filelists/files
+++ b/config/rootfiles/core/68/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 etc/modprobe.d/blacklist
 srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 65c074963..de0c4d30c 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -294,6 +294,7 @@ WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
 WARNING: translation string unused: other countries
+WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
 WARNING: translation string unused: override mtu
diff --git a/doc/language_issues.en b/doc/language_issues.en
index d05caf49b..d7a7d72ac 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
 WARNING: translation string unused: other countries
+WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
 WARNING: translation string unused: override mtu
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 538f240bb..0dea29c18 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
-WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
 WARNING: untranslated string: outgoing firewall edit ip group
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index dc14c540f..bec722394 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -580,7 +580,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
-WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: ovpn mtu-disc
 WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 932f2725e..c6fa36f19 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
 WARNING: translation string unused: other countries
+WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
 WARNING: translation string unused: override mtu
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 538f240bb..0dea29c18 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
-WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
 WARNING: untranslated string: outgoing firewall edit ip group
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 3f2ba5cd3..b513b59f2 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -561,7 +561,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
-WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: outgoing traffic in bytes per second
 WARNING: untranslated string: ovpn mtu-disc
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 32242670d..d61019ef1 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -45,12 +45,6 @@ print <<END
 		<strong>$Lang::tr{'donation'}</strong>
 	</a>
 </div>
-<br><br><hr><br>
-<p style="text-align: center;">
-	$Lang::tr{'our donors'}:
-
-	<a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a>
-</p>
 END
 ;
 &Header::closebox();