* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01fad903a5a10884112042a3c311e73a4c78a71c
@ 2026-04-09 9:11 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-04-09 9:11 UTC (permalink / raw)
To: ipfire-scm
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 01fad903a5a10884112042a3c311e73a4c78a71c (commit)
via 4c0767ffc4cffc85c2e4ac43decfa9de85c33d5f (commit)
via ea8f606fc1fa638072584c666725b28279e0eefc (commit)
via d75524054e5dd37684134417a119b18ac7f32dd0 (commit)
via 99c288fa2657746e8c1476027529e632d815f810 (commit)
via b4aecdb390f60c29f1bea6670e6adea01446acf7 (commit)
from 9193150dfe23aa84c7d519bbc1c205664ca6ca86 (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 01fad903a5a10884112042a3c311e73a4c78a71c
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Apr 9 09:10:54 2026 +0000
core202: Ship latest changes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 4c0767ffc4cffc85c2e4ac43decfa9de85c33d5f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Apr 9 08:57:32 2026 +0000
configroot: Build language cache at build time
This should not be done when the system is being installed as there is
no reason to.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit ea8f606fc1fa638072584c666725b28279e0eefc
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Apr 9 09:51:31 2026 +0100
perl-Net-IPv4Addr: Drop package
This is no longer required.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit d75524054e5dd37684134417a119b18ac7f32dd0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Apr 9 09:49:43 2026 +0100
general-functions.pl: Remove some legacy network functions
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 99c288fa2657746e8c1476027529e632d815f810
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Apr 9 09:49:28 2026 +0100
vpnmain.cgi: Remove using legacy network functions
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit b4aecdb390f60c29f1bea6670e6adea01446acf7
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Apr 9 09:49:01 2026 +0100
proxy.cgi: Remove using legacy network functions
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 12 -----
config/rootfiles/common/configroot | 11 +++++
config/rootfiles/common/perl-Net-IPv4Addr | 10 ----
config/rootfiles/core/202/filelists/files | 3 ++
config/rootfiles/core/202/update.sh | 4 +-
html/cgi-bin/proxy.cgi | 4 +-
html/cgi-bin/vpnmain.cgi | 2 +-
lfs/configroot | 3 ++
lfs/flash-images | 2 -
lfs/perl-Net-IPv4Addr | 77 -------------------------------
make.sh | 1 -
src/installer/main.c | 7 ---
12 files changed, 23 insertions(+), 113 deletions(-)
delete mode 100644 config/rootfiles/common/perl-Net-IPv4Addr
delete mode 100644 lfs/perl-Net-IPv4Addr
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index bcc8942c3..311231632 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -17,7 +17,6 @@ package General;
use strict;
use Socket;
use IO::Socket;
-use Net::IPv4Addr qw(:all);
$General::version = 'VERSION';
$General::swroot = 'CONFIG_ROOT';
@@ -880,17 +879,6 @@ sub IpInSubnet {
return &Network::ip_address_in_network($addr, "$network/$netmask");
}
-sub ipcidr {
- my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift);
- return "$ip\/$cidr";
-}
-
-sub ipcidr2msk {
- my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift);
- my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr);
- return "$ip\/$netmask";
-}
-
sub validemail {
my $address = shift;
my @parts = split( /\@/, $address );
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 7cc93302f..d289141e1 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -91,6 +91,17 @@ var/ipfire/ipblocklist-functions.pl
var/ipfire/key
var/ipfire/lang.pl
var/ipfire/langs
+#var/ipfire/langs/cache-lang.pl.de
+#var/ipfire/langs/cache-lang.pl.en
+#var/ipfire/langs/cache-lang.pl.es
+#var/ipfire/langs/cache-lang.pl.fr
+#var/ipfire/langs/cache-lang.pl.it
+#var/ipfire/langs/cache-lang.pl.nl
+#var/ipfire/langs/cache-lang.pl.pl
+#var/ipfire/langs/cache-lang.pl.ru
+#var/ipfire/langs/cache-lang.pl.tr
+#var/ipfire/langs/cache-lang.pl.tw
+#var/ipfire/langs/cache-lang.pl.zh
#var/ipfire/langs/de.pl
#var/ipfire/langs/en.pl
#var/ipfire/langs/es.pl
diff --git a/config/rootfiles/common/perl-Net-IPv4Addr b/config/rootfiles/common/perl-Net-IPv4Addr
deleted file mode 100644
index 4ec471d81..000000000
--- a/config/rootfiles/common/perl-Net-IPv4Addr
+++ /dev/null
@@ -1,10 +0,0 @@
-#usr/bin/ipv4calc
-usr/lib/perl5/site_perl/5.36.0/Net/IPv4Addr.pm
-#usr/lib/perl5/site_perl/5.36.0/auto
-#usr/lib/perl5/site_perl/5.36.0/auto/Net
-#usr/lib/perl5/site_perl/5.36.0/auto/Net/IPv4Addr
-usr/lib/perl5/site_perl/5.36.0/auto/Net/IPv4Addr/autosplit.ix
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Net/IPv4Addr
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Net/IPv4Addr/.packlist
-#usr/share/man/man1/ipv4calc.1
-#usr/share/man/man3/Net::IPv4Addr.3
diff --git a/config/rootfiles/core/202/filelists/files b/config/rootfiles/core/202/filelists/files
index 36268b9e6..ee0138114 100644
--- a/config/rootfiles/core/202/filelists/files
+++ b/config/rootfiles/core/202/filelists/files
@@ -1,7 +1,10 @@
etc/rc.d/init.d/firewall
etc/rc.d/init.d/sysklogd
srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/dns/dnsbl.json
+var/ipfire/general-functions.pl
var/ipfire/urlfilter/bin/autoupdate.pl
var/spool/cron/root.orig
diff --git a/config/rootfiles/core/202/update.sh b/config/rootfiles/core/202/update.sh
index 838c1b353..677cc8c9c 100644
--- a/config/rootfiles/core/202/update.sh
+++ b/config/rootfiles/core/202/update.sh
@@ -56,7 +56,9 @@ fi
# Remove files
rm -vf \
- /usr/sbin/klogd
+ /usr/sbin/klogd \
+ /usr/lib/perl5/site_perl/5.36.0/Net/IPv4Addr.pm \
+ /usr/lib/perl5/site_perl/5.36.0/auto/Net/IPv4Addr/autosplit.ix
# Terminate the kernel logger
killall klogd
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 1f2d0ce7b..837f9c683 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -168,12 +168,12 @@ my $HAVE_NTLM_AUTH = (-e "/usr/bin/ntlm_auth");
my $green_cidr = "";
if (&Header::green_used() && $netsettings{'GREEN_DEV'}) {
- $green_cidr = &General::ipcidr("$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}");
+ $green_cidr = &Network::normalize_network("$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}");
}
my $blue_cidr = "";
if (&Header::blue_used() && $netsettings{'BLUE_DEV'}) {
- $blue_cidr = &General::ipcidr("$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}");
+ $blue_cidr = &Network::normalize_network("$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}");
}
&Header::showhttpheaders();
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 154b94033..7de5b1664 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3802,7 +3802,7 @@ sub make_subnets($$) {
my @nets = split(/\|/, $subnets);
my @cidr_nets = ();
foreach my $net (@nets) {
- my $cidr_net = &General::ipcidr($net);
+ my $cidr_net = &Network::normalize_network($net);
# Skip 0.0.0.0/0 for remote because this renders the
# while system inaccessible
diff --git a/lfs/configroot b/lfs/configroot
index b4f412a8a..d0e712070 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -181,4 +181,7 @@ $(TARGET) :
chown -Rv root:root $(CONFIG_ROOT)/*/bin
chown root:nobody $(CONFIG_ROOT)/dhcpc
+ # Build the language cache
+ /usr/local/bin/update-lang-cache
+
@$(POSTBUILD)
diff --git a/lfs/flash-images b/lfs/flash-images
index e7e5ea8b2..56f8bfc69 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -154,8 +154,6 @@ endif
mount --bind /dev $(MNThdd)/dev
mount --bind /sys $(MNThdd)/sys
- chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
# Run the filesystem cleanup script
chroot $(MNThdd) /usr/local/bin/filesystem-cleanup > $(DIR_TMP)/cleanup.log
diff --git a/lfs/perl-Net-IPv4Addr b/lfs/perl-Net-IPv4Addr
deleted file mode 100644
index c776b5017..000000000
--- a/lfs/perl-Net-IPv4Addr
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 0.10
-
-THISAPP = Net-IPv4Addr-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 2a424c042c6585b14ae23abc4ee829a8c34a461ec6b5b44d48d78230fc49a340e409e05927bc473f9534d0baec2cc0238abe17af069c2500eb885ecb8a31c419
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && perl Makefile.PL
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index cbe022faf..dc2aeafc8 100755
--- a/make.sh
+++ b/make.sh
@@ -1822,7 +1822,6 @@ build_system() {
lfsmake2 perl-LWP-Protocol-https
lfsmake2 perl-Net-HTTP
lfsmake2 perl-Net-DNS
- lfsmake2 perl-Net-IPv4Addr
lfsmake2 perl-Net_SSLeay
lfsmake2 perl-IO-Stringy
lfsmake2 perl-IO-Socket-SSL
diff --git a/src/installer/main.c b/src/installer/main.c
index f8800a657..911eedebd 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -758,13 +758,6 @@ int main(int argc, char *argv[]) {
/* Save language und local settings */
write_lang_configs(config.language);
- /* Build cache lang file */
- snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
- if (runcommandwithstatus(commandstring, title, _("Installing the language cache..."), logfile)) {
- errorbox(_("Unable to install the language cache."));
- goto EXIT;
- }
-
/* trigger udev to add disk-by-uuid entries */
snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /bin/udevadm trigger");
if (runcommandwithstatus(commandstring, title, _("Trigger udev to redetect partitions..."), logfile)) {
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-04-09 9:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-04-09 9:11 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01fad903a5a10884112042a3c311e73a4c78a71c Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox