webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 04:22:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-05-16 15:47:58 +02:00
parent 7739c2dbaa 7b91d99f45
commit 1bc8f877ed
12 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/68/filelists/files
View File

@@ -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

6
config/rootfiles/packages/clamav
View File

@@ -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

1
doc/language_issues.de
View File

@@ -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

1
doc/language_issues.en
View File

@@ -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

1
doc/language_issues.es
View File

@@ -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

1
doc/language_issues.fr
View File

@@ -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

1
doc/language_issues.nl
View File

@@ -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

1
doc/language_issues.pl
View File

@@ -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

1
doc/language_issues.ru
View File

@@ -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

6
html/cgi-bin/credits.cgi
View File

@@ -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();

3
html/html/themes/maniac/include/functions.pl
View File

@@ -351,7 +351,8 @@ END
&showsubsection($menu);
&showsubsubsection($menu);
print <<END
print <<END
</div>
</div>
<br class="clear" />
<div id="footer" class="fixed">

8
lfs/clamav
View File

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