* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3f11d447512cbe374fed552841de112fbc59d8dc
@ 2025-11-07 14:06 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-11-07 14:06 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 3f11d447512cbe374fed552841de112fbc59d8dc (commit)
via 9c1330d0f53597968e2d969de530ee4a5ad1a4cc (commit)
via eb5263326842408b46d5b6a5b937f52b53b98ff7 (commit)
via 552355c9794f626a2b9badb0935c54748c17f4af (commit)
via 48e7c114a1242d432d66436d79aa83a70843896f (commit)
via ec39a394c5754b4770396f2f3cdb437467645a45 (commit)
via af93f1fd708a323a0429cda64b6f5645e020395f (commit)
from 978e8029150ae57cb1ec0326a7e341a50c850f49 (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 3f11d447512cbe374fed552841de112fbc59d8dc
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:52:43 2025 +0000
backup: Include /etc/locale.conf
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 9c1330d0f53597968e2d969de530ee4a5ad1a4cc
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:51:01 2025 +0000
core199: Ship /etc/locale.conf
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit eb5263326842408b46d5b6a5b937f52b53b98ff7
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:50:22 2025 +0000
stage2: Create /etc/locale.conf
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 552355c9794f626a2b9badb0935c54748c17f4af
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:50:03 2025 +0000
core199: Ship the redirect wrapper
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 48e7c114a1242d432d66436d79aa83a70843896f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:49:31 2025 +0000
urlfilter: Remove squidclamav from the redirect wrapper
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit ec39a394c5754b4770396f2f3cdb437467645a45
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:47:38 2025 +0000
proxy.cgi: Remove remainders of squidclamav
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit af93f1fd708a323a0429cda64b6f5645e020395f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Nov 7 13:37:47 2025 +0000
vdradmin: Remove ineffective statement
Every line will be executed in a fresh shell, so although the statement
sets the variable, nothing will ever be called to use it.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/include | 1 +
config/rootfiles/common/aarch64/stage2 | 1 +
config/rootfiles/common/riscv64/stage2 | 1 +
config/rootfiles/common/x86_64/stage2 | 1 +
config/rootfiles/core/199/filelists/files | 3 +++
config/urlfilter/redirect_wrapper | 7 +----
html/cgi-bin/proxy.cgi | 44 +------------------------------
lfs/stage2 | 3 +++
lfs/vdradmin | 1 -
9 files changed, 12 insertions(+), 50 deletions(-)
Difference in files:
diff --git a/config/backup/include b/config/backup/include
index 2b675ad21d..0086c12413 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -6,6 +6,7 @@ etc/httpd/server-ecdsa.csr
etc/httpd/server-ecdsa.key
etc/ipsec.user.*
etc/ipsec.user-post.conf
+etc/locale.conf
etc/logrotate.d
etc/passwd
etc/shadow
diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 3ac85638fa..7e36bf86f7 100644
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -17,6 +17,7 @@ etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/issue
etc/ld.so.conf
+etc/locale.conf
etc/logrotate.conf
etc/mime.types
etc/modprobe.d
diff --git a/config/rootfiles/common/riscv64/stage2 b/config/rootfiles/common/riscv64/stage2
index fdccf0d337..f9a3157f30 100644
--- a/config/rootfiles/common/riscv64/stage2
+++ b/config/rootfiles/common/riscv64/stage2
@@ -17,6 +17,7 @@ etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/issue
etc/ld.so.conf
+etc/locale.conf
etc/logrotate.conf
etc/mime.types
etc/modprobe.d
diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index c0decfc279..dd1582343e 100644
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -17,6 +17,7 @@ etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/issue
etc/ld.so.conf
+etc/locale.conf
etc/logrotate.conf
etc/mime.types
etc/modprobe.d
diff --git a/config/rootfiles/core/199/filelists/files b/config/rootfiles/core/199/filelists/files
index 297d4e7e2b..1a0a4787fd 100644
--- a/config/rootfiles/core/199/filelists/files
+++ b/config/rootfiles/core/199/filelists/files
@@ -1,3 +1,4 @@
+etc/locale.conf
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/lldpd
etc/rc.d/init.d/messagebus
@@ -24,6 +25,8 @@ srv/web/ipfire/cgi-bin/wireguard.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi
usr/local/bin/lldpdctrl
usr/sbin/openvpn-authenticator
+usr/sbin/redirect_wrapper
+var/ipfire/backup/include
var/ipfire/header.pl
var/ipfire/lldp
var/ipfire/menu.d/30-network.menu
diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
index 3e8b49eacd..519d088042 100644
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -28,7 +28,6 @@ require '/var/ipfire/general-functions.pl';
my %proxysettings=();
$proxysettings{'ENABLE_FILTER'} = 'off';
-$proxysettings{'ENABLE_CLAMAV'} = 'off';
$proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
&General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -39,10 +38,6 @@ if ($proxysettings{'ENABLE_FILTER'} eq 'on') {
push(@redirectors, "/usr/bin/squidGuard");
}
-if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') {
- push(@redirectors, "/usr/bin/squidclamav");
-}
-
if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') {
push(@redirectors, "/usr/sbin/updxlrator");
}
@@ -61,7 +56,7 @@ STDOUT->autoflush(1);
my $debug=0; # enable only for debugging
if (-e "/var/ipfire/proxy/enable_redirector_debug") {
- writetolog("Urlfilter = ".$proxysettings{'ENABLE_FILTER'}." Clamav = ".$proxysettings{'ENABLE_CLAMAV'}." Updxlrator = ".$proxysettings{'ENABLE_UPDXLRATOR'});
+ writetolog("Urlfilter = ".$proxysettings{'ENABLE_FILTER'}." Updxlrator = ".$proxysettings{'ENABLE_UPDXLRATOR'});
$debug = 1;
}
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index f0547e249c..1f2d0ce7b9 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -270,7 +270,6 @@ $proxysettings{'IDENT_ENABLE_ACL'} = 'off';
$proxysettings{'IDENT_USER_ACL'} = 'positive';
$proxysettings{'ENABLE_FILTER'} = 'off';
$proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
-$proxysettings{'ENABLE_CLAMAV'} = 'off';
$ncsa_buttontext = $Lang::tr{'advproxy NCSA create user'};
@@ -643,7 +642,6 @@ ERROR:
$stdproxysettings{'UPSTREAM_PASSWORD'} = $proxysettings{'UPSTREAM_PASSWORD'};
$stdproxysettings{'ENABLE_FILTER'} = $proxysettings{'ENABLE_FILTER'};
$stdproxysettings{'ENABLE_UPDXLRATOR'} = $proxysettings{'ENABLE_UPDXLRATOR'};
- $stdproxysettings{'ENABLE_CLAMAV'} = $proxysettings{'ENABLE_CLAMAV'};
&General::writehash("${General::swroot}/proxy/settings", \%stdproxysettings);
&writeconfig;
@@ -894,10 +892,6 @@ $checked{'ENABLE_UPDXLRATOR'}{'off'} = '';
$checked{'ENABLE_UPDXLRATOR'}{'on'} = '';
$checked{'ENABLE_UPDXLRATOR'}{$proxysettings{'ENABLE_UPDXLRATOR'}} = "checked='checked'";
-$checked{'ENABLE_CLAMAV'}{'off'} = '';
-$checked{'ENABLE_CLAMAV'}{'on'} = '';
-$checked{'ENABLE_CLAMAV'}{$proxysettings{'ENABLE_CLAMAV'}} = "checked='checked'";
-
&Header::openpage($Lang::tr{'advproxy advanced web proxy configuration'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -997,19 +991,6 @@ print <<END
<table width='100%'>
END
;
-if ( -e "/usr/bin/squidclamav" ) {
- print "<td class='base'><b>".$Lang::tr{'advproxy squidclamav'}."</b><br />";
- if ( ! -e "/var/run/clamav/clamd.pid" ){
- print "<font color='red'>clamav not running</font><br /><br />";
- $proxysettings{'ENABLE_CLAMAV'} = 'off';
- }
- else {
- print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_CLAMAV' ".$checked{'ENABLE_CLAMAV'}{'on'}." /><br />";
-}
- print "</td>";
-} else {
- print "<td></td>";
-}
print "<td class='base'><a href='/cgi-bin/urlfilter.cgi'><b>".$Lang::tr{'advproxy url filter'}."</a></b><br />";
print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_FILTER' ".$checked{'ENABLE_FILTER'}{'on'}." /><br />";
print "</td>";
@@ -3533,17 +3514,6 @@ END
}
if ((!-z $extgrp) && ($proxysettings{'AUTH_METHOD'} eq 'ncsa') && ($proxysettings{'NCSA_BYPASS_REDIR'} eq 'on')) { print FILE "\nredirector_access deny for_extended_users\n"; }
- # Check if squidclamav is enabled.
- if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') {
- print FILE "\n#Settings for squidclamav:\n";
- print FILE "http_port 127.0.0.1:$proxysettings{'PROXY_PORT'}\n";
- print FILE "acl purge method PURGE\n";
- print FILE "http_access deny to_localhost\n";
- print FILE "http_access allow localhost\n";
- print FILE "http_access allow purge localhost\n";
- print FILE "http_access deny purge\n";
- print FILE "url_rewrite_access deny localhost\n";
- }
print FILE <<END;
#Access to squid:
@@ -4016,7 +3986,7 @@ END
print FILE "\nalways_direct allow IPFire_ips\n";
print FILE "never_direct allow all\n\n";
}
- if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
+ if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on'))
{
print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
print FILE "url_rewrite_children ", &General::number_cpu_cores();
@@ -4030,18 +4000,6 @@ END
print FILE "include /etc/squid/squid.conf.local\n";
}
close FILE;
-
- # Proxy settings for squidclamav - if installed.
- #
- # Check if squidclamav is enabled.
- if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') {
-
- my $configfile='/etc/squidclamav.conf';
-
- my $data = &General::read_file_utf8($configfile);
- $data =~ s/squid_port [0-9]+/squid_port $proxysettings{'PROXY_PORT'}/g;
- &General::write_file_utf8($configfile, $data);
- }
}
# -------------------------------------------------------------------
diff --git a/lfs/stage2 b/lfs/stage2
index 8ce1735897..c5130e9613 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -156,6 +156,9 @@ endif
echo "ANSI_COLOR=\"0:31\"" >> /etc/os-release
echo "BUG_REPORT_URL=\"https://bugzilla.ipfire.org/\"" >> /etc/os-release
+ # Set the locale
+ echo "LANG=en_US.UTF-8" > /etc/locale.conf
+
# Pakfire
-mkdir -pv /opt/pakfire/db/core
echo "$(CORE)" > /opt/pakfire/db/core/mine
diff --git a/lfs/vdradmin b/lfs/vdradmin
index 1fe38aa5cf..9265977d4c 100644
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -82,7 +82,6 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- export "LANG=de_DE"
cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
cd $(DIR_APP) && ./install-ipfire.sh
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-11-07 14:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-07 14:06 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3f11d447512cbe374fed552841de112fbc59d8dc Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox