Merge remote-tracking branch 'origin/master' into next

diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files
index 15680e6b2ede91c165f20d1170b0b22043c7c874..30874a52245b40fd4e145cd6adee9702205be0e5 100644 (file)
--- 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/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index db38453ffd4e5e5a4ac3f7e5ec110cd4053133a0..1f09b8d55b32a5f90e85862fefbf34161dbf1e03 100644 (file)
--- 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/doc/language_issues.de b/doc/language_issues.de
index 65c07496315884fd6380456bb8a4958de45ccf0e..de0c4d30ccf8ec7119b66e2b2e0a9ad407d6bcf8 100644 (file)
--- 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 d05caf49bb5ff57b54d9ecf0dc8ad4b7b21713d9..d7a7d72acf39c2a2bde5cb8e614ee5aea631e61b 100644 (file)
--- 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 538f240bb6077d9746ee2d2d10fd564394948d99..0dea29c181febe014fa2708de86bcfecd2223fe2 100644 (file)
--- 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 dc14c540fa3a434094cefd26fbd74720457f3e48..bec72239401a982fd8c0c303139b8362bbfb3f37 100644 (file)
--- 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 932f2725e3a74a11a5b6d0bff2cd0e0308ba31ee..c6fa36f191f95881f0936e8f09bc35986aabbe6c 100644 (file)
--- 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 538f240bb6077d9746ee2d2d10fd564394948d99..0dea29c181febe014fa2708de86bcfecd2223fe2 100644 (file)
--- 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 3f2ba5cd31c44b765cc97acc1ac609fa31b1a4eb..b513b59f2610776504ef0803087548be3e53f247 100644 (file)
--- 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 32242670d2e302aa782545dc0eaaa4ddc9d74a38..d61019ef1ca9c8d851b993300e434321860d27f9 100644 (file)
--- 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();

diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index eea8091b03db88c9116a6ea7e069bce3020a9a82..62bbf101e724e6f4e44ab72b04f94059c4b76c83 100644 (file)
--- 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">

diff --git a/lfs/clamav b/lfs/clamav
index a2ed1f0664fffc6cc5d8dd6494f5df66df49c808..bae350cb158201208d90babadb5392c291f3d3d6 100644 (file)
--- 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)