From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1bc8f877ed6aed3ef249d0505f104492ce16297b
Date: Thu, 16 May 2013 21:37:16 +0200 [thread overview]
Message-ID: <20130516193716.9F9C920192@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9736 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 1bc8f877ed6aed3ef249d0505f104492ce16297b (commit)
via 7b91d99f45ba597e05ce0f837a0b16c445f89a78 (commit)
via 409f70463134057f709bb120a6d6eac1a0b8d453 (commit)
via 099f4a9ec705c0ed09ae11815c08381b1d61041b (commit)
via 5d46c29e5afab019a7b160e344affec047ff0f91 (commit)
from 7739c2dbaa8f4b6e19e01875f843c1b4dc23819f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1bc8f877ed6aed3ef249d0505f104492ce16297b
Merge: 7739c2d 7b91d99
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Thu May 16 15:47:58 2013 +0200
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/68/filelists/files | 1 +
config/rootfiles/packages/clamav | 6 +++---
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 ------
html/html/themes/maniac/include/functions.pl | 3 ++-
lfs/clamav | 8 ++++----
12 files changed, 13 insertions(+), 18 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files
index 15680e6..30874a5 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/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index db38453..1f09b8d 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/doc/language_issues.de b/doc/language_issues.de
index 65c0749..de0c4d3 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 d05caf4..d7a7d72 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 538f240..0dea29c 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 dc14c54..bec7223 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 932f272..c6fa36f 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 538f240..0dea29c 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 3f2ba5c..b513b59 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 3224267..d61019e 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();
diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index eea8091..62bbf10 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">
diff --git a/lfs/clamav b/lfs/clamav
index a2ed1f0..bae350c 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)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)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-05-16 19:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130516193716.9F9C920192@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox