From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0555434effc70080d8278ca3db38fef51bba1efa
Date: Thu, 26 Sep 2024 14:14:15 +0000 [thread overview]
Message-ID: <4XDwZb4j13z2xPL@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3129 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, master has been updated
via 0555434effc70080d8278ca3db38fef51bba1efa (commit)
via d1a3fd9e0debf994055a410fbc7e5ba7c7c074b0 (commit)
from 84b04cb6d38eb0ca0fca426e4d6e0c0a2c467d9e (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 0555434effc70080d8278ca3db38fef51bba1efa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 26 14:13:10 2024 +0000
header.pl: Force browsers to reload rrdimage.js
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d1a3fd9e0debf994055a410fbc7e5ba7c7c074b0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 22 14:33:03 2024 +0000
ovpnmain.cgi: Fix IP address calculation with static pools
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/header.pl | 2 +-
config/rootfiles/core/189/filelists/files | 1 +
html/cgi-bin/ovpnmain.cgi | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3778c4e59..2d4aa89f2 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -195,7 +195,7 @@ print <<END;
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="shortcut icon" href="/favicon.ico" />
<script type="text/javascript" src="/include/jquery.js"></script>
- <script src="/include/rrdimage.js"></script>
+ <script src="/include/rrdimage.js?v=20240926"></script>
$extrahead
<script type="text/javascript">
diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/core/189/filelists/files
index 7afa1ac2e..7e7959886 100644
--- a/config/rootfiles/core/189/filelists/files
+++ b/config/rootfiles/core/189/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/suricata
srv/web/ipfire/cgi-bin/getrrdimage.cgi
srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/html/include/rrdimage.js
usr/bin/suricata-watcher
var/ipfire/graphs.pl
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 72695f892..daaa059a4 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -569,7 +569,7 @@ sub getccdadresses
for (my $i=1;$i<=$count;$i++) {
my $tmpip=$iprange[$i-1];
my $stepper=$i*4;
- $iprange[$i]= &General::getnextip($tmpip,4);
+ $iprange[$i]= &Network::bin2ip(&Network::ip2bin($tmpip) + 4);
}
my $r=0;
foreach my $key (keys %ccdhash) {
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2024-09-26 14:14 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=4XDwZb4j13z2xPL@people01.haj.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