* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1bea8be2ce2ce0c4ee2a07bcffb978f4ea07ab89
@ 2017-04-24 9:59 git
0 siblings, 0 replies; only message in thread
From: git @ 2017-04-24 9:59 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8759 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 1bea8be2ce2ce0c4ee2a07bcffb978f4ea07ab89 (commit)
via 723d1d911ff717ac43c24738960e76fca11c4cbd (commit)
from 1fab4edfa690b410a255b9dd1d896178512e03d5 (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 1bea8be2ce2ce0c4ee2a07bcffb978f4ea07ab89
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Apr 21 22:37:28 2017 +0200
GUI: Some simple FW-Log cosmetics
Fixed the 'details'-Button in 'firewalllogcountry.dat' by adding missing
translation string.
Each 'Loggraphs'-Page got a unique title and a new heading for the corresponding
diagram.
Just cosmetics...
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 723d1d911ff717ac43c24738960e76fca11c4cbd
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Apr 21 19:00:21 2017 +0200
unbound 1.6.1: Linking against libevent2
Hi,
this was triggered by unbound-users(a)unbound.net - it seems that the
'configure'-option '--with-libevent-support' is not enough:
***SNIP***
...
When building unbound with --with-libevent support, the make
install phase should also call make unbound-event-install or else
unbound-event.h does not get installed and the header file for
using the unbound event functionality is not available.
...
This install is triggered by the option --enable-event-api. Just
enabling --with-libevent does not trigger the install by itself.
Best regards,
Wouter
...
***SNAP***
I built 'unbound' this way - its running without any problems so far.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/unbound | 1 +
html/cgi-bin/logs.cgi/firewalllogcountry.dat | 6 +++---
html/cgi-bin/logs.cgi/firewalllogip.dat | 4 ++--
html/cgi-bin/logs.cgi/firewalllogport.dat | 4 ++--
langs/de/cgi-bin/de.pl | 8 ++++++--
langs/en/cgi-bin/en.pl | 8 ++++++--
lfs/unbound | 4 +++-
7 files changed, 23 insertions(+), 12 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index a94ea25..824567e 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -6,6 +6,7 @@ etc/unbound/icannbundle.pem
etc/unbound/local.d
etc/unbound/root.hints
etc/unbound/unbound.conf
+#usr/include/unbound-event.h
#usr/include/unbound.h
#usr/lib/libunbound.la
#usr/lib/libunbound.so
diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index 26920b5..f2b6048 100644
--- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
@@ -213,7 +213,7 @@ if ($multifile) {
my $MODNAME="fwlogs";
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log country'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -281,7 +281,7 @@ END
&Header::closebox();
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph country'});
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
my $red_interface = &General::get_red_interface();
@@ -471,7 +471,7 @@ for($s=0;$s<$lines;$s++)
print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
print"<input type='hidden' name='country' value='$key[$s]'>";
- print"<input type='submit' value='details'></form>";
+ print"<input type='submit' value='$Lang::tr{'details'}'></form>";
}
elsif ($key[$s] eq 'unknown') {
print "unknown";
diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index 08ef1c4..9e36674 100644
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -212,7 +212,7 @@ if ($multifile) {
my $MODNAME="fwlogs";
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log ip'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -283,7 +283,7 @@ END
&Header::closebox();
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph ip'});
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
my $linesjc = 0;
diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index fbc92e4..67fe6aa 100644
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -213,7 +213,7 @@ if ($multifile) {
my $MODNAME="fwlogs";
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log port'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
@@ -281,7 +281,7 @@ END
&Header::closebox();
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph port'});
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
my $linesjc = 0;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 68d925d..6443abe 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -948,11 +948,15 @@
'fireinfo why read more' => 'Mehr über die Gründe.',
'fireinfo your profile id' => 'Profil-ID',
'firewall' => 'Firewall',
-'firewall graphs' => 'Firewall-Diagramme',
+'firewall graph country' => 'Firewall-Diagramm (Land)',
+'firewall graph ip' => 'Firewall-Diagramm (IP)',
+'firewall graph port' => 'Firewall-Diagramm (Port)',
'firewall hits' => 'Gesamtanzahl der Firewall-Treffer für',
'firewall hits per' => 'Firewalltreffer pro',
'firewall log' => 'Firewall-Protokoll',
-'firewall log viewer' => 'Betrachter der Firewall-Logdateien',
+'firewall log country' => 'Firewall-Protokoll (Land)',
+'firewall log ip' => 'Firewall-Protokoll (IP)',
+'firewall log port' => 'Firewall-Protokoll (Port)',
'firewall logs' => 'Firewall-Logdateien',
'firewall logs country' => 'Fw-Logdiagramme (Land)',
'firewall logs ip' => 'Fw-Logdiagramme (IP)',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4f30f56..4c62471 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -975,11 +975,15 @@
'fireinfo why read more' => 'Read more about the reasons.',
'fireinfo your profile id' => 'Your profile ID',
'firewall' => 'Firewall',
-'firewall graphs' => 'Firewall Graphs',
+'firewall graph country' => 'Firewall-Diagram (Country)',
+'firewall graph ip' => 'Firewall-Diagram (IP)',
+'firewall graph port' => 'Firewall-Diagram (Port)',
'firewall hits' => 'Total number of firewall hits for',
'firewall hits per' => 'firewallhits per',
'firewall log' => 'Firewall log',
-'firewall log viewer' => 'Firewall Log Viewer',
+'firewall log country' => 'Firewall log (Country)',
+'firewall log ip' => 'Firewall log (IP)',
+'firewall log port' => 'Firewall log (Port)',
'firewall logs' => 'Firewall Logs',
'firewall logs country' => 'Fw-Loggraphs (Country)',
'firewall logs ip' => 'Fw-Loggraphs (IP)',
diff --git a/lfs/unbound b/lfs/unbound
index f361f24..d78bd95 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -78,7 +78,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-pidfile=/var/run/unbound.pid \
--with-rootkey-file=/var/lib/unbound/root.key \
--disable-static \
- --with-libevent
+ --with-libevent \
+ --enable-event-api
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-24 9:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-24 9:59 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1bea8be2ce2ce0c4ee2a07bcffb978f4ea07ab89 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox